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 [8/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/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanCheckboxRenderer.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/SelectBooleanCheckboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanCheckboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -28,11 +28,13 @@
     
   }  
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectBooleanCheckbox";
   }
   
+  @Override
   protected boolean isIndented()
   {
     return true;
@@ -42,6 +44,7 @@
    * Don't render <label> on the label portion if there's
    * a "text" attribute set.
    */
+  @Override
   protected boolean hasOwnLabel(FacesBean bean)
   {
     String text = _simpleSelectBooleanCheckbox.getText(bean);
@@ -52,6 +55,7 @@
     return false;
   }
 
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleSelectBooleanCheckbox;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanRadioRenderer.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/SelectBooleanRadioRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectBooleanRadioRenderer.java Sun Aug  6 16:12:37 2006
@@ -27,6 +27,7 @@
     
   } 
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectBooleanRadio";
@@ -36,6 +37,7 @@
    * selectBooleanRadio should not render a &lt;label&gt; on itself
    * if "text" is set.
    */ 
+  @Override
   protected boolean hasOwnLabel(FacesBean bean)
   {
     String text = _simpleSelectBooleanRadio.getText(bean);
@@ -46,11 +48,13 @@
     return false;
   }
 
+  @Override
   protected boolean isIndented()
   {
     return true;
   }  
  
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleSelectBooleanRadio;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyCheckboxRenderer.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/SelectManyCheckboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyCheckboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -28,12 +28,14 @@
     super(CoreSelectManyCheckbox.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _layoutKey = type.findKey("layout");
   } 
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectManyCheckbox";
@@ -44,6 +46,7 @@
     return toString(bean.getProperty(_layoutKey));
   }
 
+  @Override
   protected String getDefaultLabelValign(FacesBean bean)
   {
     // Don't top-align for horizontal radio buttons.
@@ -56,16 +59,19 @@
   /**
    * selectManyCheckbox should not render a &lt;label&gt; on itself.
    */ 
+  @Override
   protected boolean hasOwnLabel(FacesBean bean)
   {
     return true;
   }
   
+  @Override
   protected boolean showAccessKeyOnLabel(FacesBean bean)
   {
     return true;
   }
 
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleSelectManyCheckbox;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyListboxRenderer.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/SelectManyListboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyListboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -27,16 +27,19 @@
     super(CoreSelectManyListbox.TYPE);
   }  
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectManyListbox";
   }
   
+  @Override
   protected String getDefaultLabelValign(FacesBean bean)
   {
     return "top";
   }
 
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleSelectManyListbox;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneChoiceRenderer.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/SelectOneChoiceRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneChoiceRenderer.java Sun Aug  6 16:12:37 2006
@@ -28,11 +28,13 @@
     
   }  
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectOneChoice";
   }
   
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleSelectOneChoice;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneListboxRenderer.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/SelectOneListboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneListboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -28,16 +28,19 @@
     
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectOneListbox";
   }
   
+  @Override
   protected String getDefaultLabelValign(FacesBean bean)
   {
     return "top";
   }
 
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleSelectOneListbox;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectOneRadioRenderer.java Sun Aug  6 16:12:37 2006
@@ -27,12 +27,14 @@
     super(CoreSelectOneRadio.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _layoutKey = type.findKey("layout");
   } 
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectOneRadio";
@@ -43,6 +45,7 @@
     return toString(bean.getProperty(_layoutKey));
   }
 
+  @Override
   protected String getDefaultLabelValign(FacesBean bean)
   {
     // Don't top-align for horizontal radio buttons.
@@ -55,16 +58,19 @@
   /**
    * selectOneRadio should not render a &lt;label&gt; on itself.
    */ 
-   protected boolean hasOwnLabel(FacesBean bean)
-   {
-     return true;
-   }
+  @Override
+  protected boolean hasOwnLabel(FacesBean bean)
+  {
+    return true;
+  }
 
+  @Override
   protected boolean showAccessKeyOnLabel(FacesBean bean)
   {
     return true;
   }
   
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleSelectOneRadio;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.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/SelectRangeChoiceBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java Sun Aug  6 16:12:37 2006
@@ -58,6 +58,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -68,9 +69,13 @@
     _varKey = type.findKey("var");
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
-    Map parameters =  context.getExternalContext().getRequestParameterMap();
+    Map<String, String> parameters = 
+      context.getExternalContext().getRequestParameterMap();
+    
     Object event = parameters.get(XhtmlConstants.EVENT_PARAM);
 
     // get the goto event parameter values and queue a RangeChangeEvent.
@@ -153,7 +158,7 @@
                                 newStart, newEnd);
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
@@ -162,6 +167,7 @@
   /**
    * Always render an ID, needed for proper PPR.
    */
+  @Override
   protected boolean shouldRenderId(
     FacesContext context,
     UIComponent  component)
@@ -269,6 +275,7 @@
 
   /**
    */
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -629,7 +636,8 @@
     }
     else
     {
-      List items = new ArrayList((int) _MAX_VISIBLE_OPTIONS);
+      List<SelectItem> items = 
+        new ArrayList<SelectItem>((int) _MAX_VISIBLE_OPTIONS);
 
       int selectedIndex = _getItems(context, arc, component, items,
                                     minValue, maxValue, currentValue,
@@ -685,8 +693,7 @@
         writer.startElement("span", null);
         renderStyleClass(context, arc,
                          XhtmlConstants.AF_FIELD_TEXT_STYLE_CLASS);
-        writer.writeText(((SelectItem) items.get(0)).getLabel(),
-                         null);
+        writer.writeText(items.get(0).getLabel(), null);
         writer.endElement("span");
       }
     }
@@ -694,15 +701,15 @@
 
 
   private void _writeSelectItems(
-    FacesContext context,
-    List         items,
-    int          selectedIndex) throws IOException
+    FacesContext     context,
+    List<SelectItem> items,
+    int              selectedIndex) throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();
     int count = items.size();
     for (int i = 0; i < count; i++)
     {
-      SelectItem item = (SelectItem) items.get(i);
+      SelectItem item = items.get(i);
       writer.startElement("option", null);
       writer.writeAttribute("value", item.getValue(), null);
       if (i == selectedIndex)
@@ -720,7 +727,7 @@
     FacesContext        context,
     RenderingContext arc,
     UIComponent         component,
-    List                items,
+    List<SelectItem>    items,
     long                minValue, long maxValue, long value,
     int                 blockSize,
     UIComponent         rangeLabel)
@@ -730,8 +737,7 @@
     boolean maxUnknown = (maxValue == XhtmlConstants.MAX_VALUE_UNKNOWN);
 
     // Zero-indexed block index.
-    long blockIndex = (value - minValue + ((long) blockSize) - 1L) /
-      (long) blockSize;
+    long blockIndex = (value - minValue + blockSize - 1L) / blockSize;
 
     // sometimes a record set won't start on a multiple of blockSize. So
     // remember to add any offset:
@@ -747,8 +753,7 @@
       maxBlockIndex = blockIndex + 1;
     else
     {
-      maxBlockIndex = (maxValue - minValue - offset) /
-                      ((long) blockSize);
+      maxBlockIndex = (maxValue - minValue - offset) / blockSize;
       if (offset > 0)
         maxBlockIndex++;
     }
@@ -798,7 +803,7 @@
          blockIndex <= lastBlockIndex;
          blockIndex++)
     {
-      long blockStart = minValue + (blockIndex * ((long) blockSize));
+      long blockStart = minValue + (blockIndex * blockSize);
 
       // if there is an offset, then adjust accordingly. for example, if the
       // offset is 7 (and the blockSize is 10), then the new blockStarts are:
@@ -1094,6 +1099,7 @@
    *   {0}-{1}
    *  (and not bother with the "of" substitution)
    */
+  @SuppressWarnings("unchecked")
   private String _getRangeString(
     FacesContext        context,
     RenderingContext arc,
@@ -1138,7 +1144,7 @@
       String var = getVar(getFacesBean(component));
       if (var != null)
       {
-        Map requestMap =
+        Map<String, Object> requestMap =
           context.getExternalContext().getRequestMap();
         old = requestMap.put(var, range);
       }
@@ -1149,8 +1155,9 @@
 
       if (var != null)
       {
-        Map requestMap =
+        Map<String, Object> requestMap =
           context.getExternalContext().getRequestMap();
+        
         if (old == null)
           requestMap.remove(var);
         else

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.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/ShowDetailHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailHeaderRenderer.java Sun Aug  6 16:12:37 2006
@@ -37,8 +37,8 @@
   {
     super(CoreShowDetailHeader.TYPE);
   }
-
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -46,13 +46,14 @@
     _disclosedKey = type.findKey("disclosed");
   }
 
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
     // Delegate decoding to the showDetail renderer
     _detailRenderer.decode(context, component);
   }
 
-
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -61,7 +62,7 @@
   {
     // map the resource value keys that are used in showDetail and header
     // to the keys we need to use in this renderer.
-    Map originalResourceKeyMap = arc.getSkinResourceKeyMap();
+    Map<String, String> originalResourceKeyMap = arc.getSkinResourceKeyMap();
     try
     {
 
@@ -75,6 +76,7 @@
     }
   }
 
+  @Override
   protected void renderIcon(FacesContext context, RenderingContext arc, 
                             UIComponent component, FacesBean bean, String messageType)
     throws IOException
@@ -82,6 +84,7 @@
     delegateRenderer(context, arc, component, bean, _detailRenderer);
   }
 
+  @Override
   protected String getMessageType(FacesBean bean)
   {
     // Not currently supported
@@ -97,6 +100,7 @@
     return Boolean.TRUE.equals(o);
   }
 
+  @Override
   protected boolean shouldRenderChildren(FacesBean bean)
   {
     return getDisclosed(bean);
@@ -110,11 +114,13 @@
       super(type);
     }
     
+    @Override
     protected void renderId(FacesContext context, UIComponent component)
       throws IOException
     {
     }
 
+    @Override
     protected void renderAllAttributes(FacesContext context, 
                                        RenderingContext arc, 
                                        FacesBean bean)
@@ -122,11 +128,13 @@
     {
     }
 
+    @Override
     protected boolean renderAsInline()
     {
       return true;
     }
 
+    @Override
     protected String getDisclosureText(RenderingContext arc, 
                                        FacesBean bean, boolean disclosed)
     {
@@ -137,9 +145,11 @@
   private CoreRenderer _detailRenderer;
   private PropertyKey  _disclosedKey;
   
-  private static final Map _RESOURCE_KEY_MAP  =  new HashMap();
+  private static final Map<String, String> _RESOURCE_KEY_MAP;
   static
   {
+    _RESOURCE_KEY_MAP  =  new HashMap<String, String>();
+    
     _RESOURCE_KEY_MAP.put("af_showDetail.DISCLOSED" ,
                           "af_showDetailHeader.DISCLOSED");
     _RESOURCE_KEY_MAP.put("af_showDetail.UNDISCLOSED" ,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.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/ShowDetailItemRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailItemRenderer.java Sun Aug  6 16:12:37 2006
@@ -43,15 +43,20 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _disclosedKey = type.findKey("disclosed");
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
-    Map parameters =  context.getExternalContext().getRequestParameterMap();
+    Map<String, String> parameters = 
+      context.getExternalContext().getRequestParameterMap();
+    
     Object event = parameters.get(XhtmlConstants.EVENT_PARAM);
     if (XhtmlConstants.HIDE_EVENT.equals(event) ||
         XhtmlConstants.SHOW_EVENT.equals(event))
@@ -68,7 +73,7 @@
     }
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
@@ -83,6 +88,7 @@
     return Boolean.TRUE.equals(o);
   }
 
+  @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/ShowDetailRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.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/ShowDetailRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java Sun Aug  6 16:12:37 2006
@@ -46,6 +46,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -56,6 +57,7 @@
 
   /**
    */
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -193,6 +195,7 @@
   /**
    * Always render an ID, needed for proper PPR.
    */
+  @Override
   protected boolean shouldRenderId(
     FacesContext context,
     UIComponent  component)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.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/SimpleInputColorRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java Sun Aug  6 16:12:37 2006
@@ -62,6 +62,7 @@
     super(CoreInputColor.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -69,6 +70,7 @@
     _chooseIdKey = type.findKey("chooseId");
   }
 
+  @Override
   protected void queueActionEvent(FacesContext context, UIComponent component)
   {
     FacesBean bean = getFacesBean(component);
@@ -83,7 +85,7 @@
     // a calendar window with the _ldp JS function)
     else
     {
-      Object submittedValue = (String) getSubmittedValue(bean);
+      Object submittedValue = getSubmittedValue(bean);
       Color color = null;
       try
       {
@@ -104,7 +106,7 @@
       RequestContext afContext = RequestContext.getCurrentInstance();
 
       // =-=AEW Parameters?  Shouldn't we pass in the color?
-      Map parameters = null;
+      Map<String, Object> parameters = null;
       afContext.launchDialog(GenericEntry.getGenericEntryViewRoot(context),
                              parameters,
                              component,
@@ -117,6 +119,7 @@
   /**
    * Give subclasses a chance to override the ReturnEvent.
    */
+  @Override
   protected void queueReturnEvent(
     FacesContext context,
     UIComponent  component,
@@ -152,7 +155,7 @@
     event.queue();
   }
 
-
+  @Override
   protected void encodeAllAsElement(
     FacesContext        context,
     RenderingContext arc,
@@ -176,6 +179,7 @@
     arc.getProperties().remove(_CACHED_CHOOSE_ID);
   }
 
+  @Override
   protected void renderTextField(
     FacesContext        context,
     RenderingContext arc,
@@ -210,6 +214,7 @@
     }
   }
 
+  @Override
   protected void renderContent(
     FacesContext        context,
     RenderingContext arc,
@@ -228,6 +233,7 @@
     }
   }
 
+  @Override
   protected void renderAfterTextField(
     FacesContext        context,
     RenderingContext arc,
@@ -249,6 +255,7 @@
     }
   }
 
+  @Override
   protected void renderIcon(
     FacesContext        context,
     RenderingContext arc,
@@ -271,6 +278,7 @@
   /**
    * Return a default converter.
    */
+  @Override
   protected Converter getDefaultConverter(
     FacesContext context,
     FacesBean    bean)
@@ -278,7 +286,7 @@
     return _DEFAULT_CONVERTER;
   }
 
-
+  @Override
   protected String getLaunchOnclick(
     FacesContext        context,
     RenderingContext arc,
@@ -310,6 +318,7 @@
     return onClickBuffer.toString();
   }
 
+  @Override
   protected String getOnfocus(FacesBean bean)
   {
     String onfocus = super.getOnfocus(bean);
@@ -337,6 +346,7 @@
     }
   }
 
+  @Override
   protected String getOnblur(FacesBean bean)
   {
     String onblur = super.getOnblur(bean);
@@ -349,8 +359,7 @@
                                    onblur, false);
   }
 
-
-
+  @Override
   protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
     Converter converter = getConverter(bean);
@@ -366,6 +375,7 @@
     return _DEFAULT_COLUMNS;
   }
 
+  @Override
   protected Number getMaximumLength(FacesBean bean)
   {
     // Not supported for selectInputColor
@@ -373,7 +383,7 @@
     return null;
   }
 
-
+  @Override
   protected String getButtonIconName()
   {
     return XhtmlConstants.AF_SELECT_INPUT_COLOR_LAUNCH_ICON_NAME;
@@ -393,11 +403,13 @@
     return Boolean.TRUE.equals(o);
   }
 
+  @Override
   protected String getRootStyleClass(FacesBean bean)
   {
     return "af|inputColor";
   }
 
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|inputColor::content";
@@ -425,6 +437,7 @@
     return (arc.getAgent().getAgentType() != TrinidadAgent.TYPE_PDA);
   }
 
+  @Override
   protected String getSearchDesc(FacesBean bean)
   {
     RenderingContext arc = RenderingContext.getCurrentInstance();
@@ -531,6 +544,7 @@
 
   // Checks to see whether this is the first color field for
   // a given chooseId, and if so renders a script
+  @SuppressWarnings("unchecked")
   private void _renderFirstColorFieldScript(
     FacesContext        context,
     RenderingContext arc,
@@ -550,12 +564,12 @@
     String id = getClientId(context, component);
 
 
-    Map chooseColorIds = (Map)
+    Map<String, Boolean> chooseColorIds = (Map<String, Boolean>)
       arc.getProperties().get(_CHOOSE_COLOR_IDS_KEY);
 
     if (chooseColorIds == null)
     {
-      chooseColorIds = new HashMap();
+      chooseColorIds = new HashMap<String, Boolean>();
       arc.getProperties().put(_CHOOSE_COLOR_IDS_KEY, chooseColorIds);
     }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.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/SimpleInputDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java Sun Aug  6 16:12:37 2006
@@ -30,6 +30,7 @@
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.DateTimeConverter;
+import javax.faces.validator.Validator;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
@@ -60,12 +61,14 @@
     super(CoreInputDate.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _chooseIdKey = type.findKey("chooseId");
   }
 
+  @Override
   protected void queueActionEvent(FacesContext context, UIComponent component)
   {
     FacesBean bean = getFacesBean(component);
@@ -80,7 +83,7 @@
     // a calendar window with the _ldp JS function)
     else
     {
-      Object submittedValue = (String) getSubmittedValue(bean);
+      Object submittedValue = getSubmittedValue(bean);
       Date date = null;
       try
       {
@@ -110,7 +113,7 @@
       if (date == null)
         date = new Date();
 
-      Map parameters = new HashMap();
+      Map<String, Object> parameters = new HashMap<String, Object>();
       parameters.put(XhtmlConstants.VALUE_PARAM, _getDateAsString(date));
       parameters.put(XhtmlConstants.MIN_VALUE_PARAM,
                      dtrv == null
@@ -133,6 +136,7 @@
   /**
    * Give subclasses a chance to override the ReturnEvent.
    */
+  @Override
   protected void queueReturnEvent(
     FacesContext context,
     UIComponent  component,
@@ -169,7 +173,7 @@
     event.queue();
   }
 
-
+  @Override
   protected void encodeAllAsElement(
     FacesContext        context,
     RenderingContext arc,
@@ -191,6 +195,7 @@
     }
   }
 
+  @Override
   protected void renderIcon(
     FacesContext        context,
     RenderingContext arc,
@@ -213,6 +218,7 @@
    * may map to "medium"
    * @todo medium / default is  what it is defaulted to in faces
    */
+  @Override
   protected Converter getDefaultConverter(
     FacesContext context,
     FacesBean    bean)
@@ -258,6 +264,7 @@
     return converter;
   }
 
+  @Override
   protected String getOnblur(FacesBean bean)
   {
     String onblur = super.getOnblur(bean);
@@ -283,6 +290,7 @@
     return XhtmlUtils.getChainedJS(buffer.toString(), onblur, false);
   }
 
+  @Override
   protected String getOnfocus(FacesBean bean)
   {
     String onfocus = super.getOnfocus(bean);
@@ -317,7 +325,7 @@
     }
   }
 
-
+  @Override
   protected String getLaunchOnclick(
     FacesContext        context,
     RenderingContext arc,
@@ -379,7 +387,7 @@
     return onClickBuffer.toString();
   }
 
-
+  @Override
   protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
     Converter converter = getConverter(bean);
@@ -397,7 +405,7 @@
     return _DEFAULT_COLUMNS;
   }
 
-
+  @Override
   protected String getButtonIconName()
   {
     return XhtmlConstants.AF_SELECT_INPUT_DATE_LAUNCH_ICON_NAME;
@@ -408,6 +416,7 @@
     return toString(bean.getProperty(_chooseIdKey));
   }
 
+  @Override
   protected String getSearchDesc(FacesBean bean)
   {
     RenderingContext arc = RenderingContext.getCurrentInstance();
@@ -417,12 +426,13 @@
     return arc.getTranslatedString(_LAUNCH_PICKER_TIP_KEY);
   }
 
-
+  @Override
   protected String getRootStyleClass(FacesBean bean)
   {
     return "af|inputDate";
   }
 
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|inputDate::content";
@@ -447,6 +457,7 @@
   // Checks to see whether the current dateField should
   // be active, and if so, renders a script that will activate
   // it.
+  @SuppressWarnings("unchecked")
   private void _checkIfActive(
     FacesContext        context,
     RenderingContext arc,
@@ -459,13 +470,12 @@
 
     String id = getClientId(context, component);
 
-
-    Map activeDateFields = (Map)
+    Map<String, Boolean> activeDateFields = (Map<String, Boolean>)
       arc.getProperties().get(_ACTIVE_DATE_FIELDS_KEY);
 
     if (activeDateFields == null)
     {
-      activeDateFields = new HashMap();
+      activeDateFields = new HashMap<String, Boolean>();
       arc.getProperties().put(_ACTIVE_DATE_FIELDS_KEY, activeDateFields);
     }
 
@@ -500,7 +510,7 @@
   //
   private DateTimeRangeValidator _findDateTimeRangeValidator(FacesBean bean)
   {
-    Iterator validators = getValidators(bean);
+    Iterator<Validator> validators = getValidators(bean);
     while (validators.hasNext())
     {
       Object validator = validators.next();
@@ -563,13 +573,11 @@
     // properly ie. MIN_VALUE < (longValue + tzOffset) < MAX_VALUE.
     if (tzOffset < 0)
     {
-     tzOffset = (long)Math.max((float)tzOffset,
-                               (float)Long.MIN_VALUE - (float)dateValueInMs);
+      tzOffset = Math.max(tzOffset, Long.MIN_VALUE - dateValueInMs);
     }
     else
     {
-     tzOffset = (long)Math.min((float)tzOffset,
-                               (float)Long.MAX_VALUE - (float)dateValueInMs);
+      tzOffset = Math.min(tzOffset, Long.MAX_VALUE - dateValueInMs);
     }
 
     // adjust the date in ms to the adjusted time zone.
@@ -592,11 +600,13 @@
     {
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _DATE_TIME_ZONE_OFFSET_KEY;
     }
 
+    @Override
     protected void outputScriptletContent(
       FacesContext context,
       RenderingContext arc)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.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/SimpleInputFileRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java Sun Aug  6 16:12:37 2006
@@ -37,6 +37,7 @@
   //
   // DECODE BEHAVIOR
   // 
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -59,6 +60,7 @@
     return result;
   }
 
+  @Override
   public Object getConvertedValue(
     FacesContext context,
     UIComponent  component,
@@ -79,6 +81,7 @@
   /**
    * <inputFile> cannot show a value.
    */
+  @Override
   protected String getConvertedString(
     FacesContext context,
     UIComponent  component,
@@ -87,6 +90,7 @@
     return null;
   }
 
+  @Override
   protected String getDefaultInputType()
   {
     return "file";
@@ -98,44 +102,51 @@
   // an inputFile
   // 
 
+  @Override
   public boolean isTextArea(
     FacesBean bean)
   {
     return false;
   }
 
+  @Override
   protected boolean isAutoSubmit(
     FacesBean bean)
   {
     return false;
   }
 
+  @Override
   protected boolean getSecret(FacesBean bean)
   {
     return false;
   }
 
+  @Override
   protected Number getMaximumLength(FacesBean bean)
   {
     return null;
   }
 
-
+  @Override
   protected boolean getReadOnly(FacesContext context, FacesBean bean)
   {
     return false;
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputFile";
   }
 
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|inputFile::content";
   }
 
+  @Override
   protected Integer getDefaultColumns(RenderingContext arc, FacesBean bean)
   {
     return null;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.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/SimpleInputListOfValuesRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java Sun Aug  6 16:12:37 2006
@@ -53,6 +53,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -65,6 +66,8 @@
   // DECODE BEHAVIOR
   //
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
     super.decode(context, component);
@@ -81,7 +84,9 @@
     }
     else
     {
-      Map parameterMap = context.getExternalContext().getRequestParameterMap();
+      Map<String, String> parameterMap = 
+        context.getExternalContext().getRequestParameterMap();
+      
       Object source = parameterMap.get("source");
       String clientId = component.getClientId(context);
       if ((source != null) && source.equals(clientId))
@@ -125,6 +130,7 @@
   // Encode behavior
   //
 
+  @Override
   protected void encodeAllAsElement(
     FacesContext        context,
     RenderingContext arc,
@@ -147,6 +153,7 @@
       rw.endElement("span");
   }
   
+  @Override
   protected void encodeAllAsNonElement(
     FacesContext        context,
     RenderingContext arc,
@@ -171,6 +178,7 @@
    * the span and root dom element styles on the text field, which we 
    * don't, since we do it ourselves on our root dom element.
    */
+  @Override
   protected boolean isSimpleInputText(FacesBean bean)
   {
     return false;
@@ -317,12 +325,14 @@
     }
   }
 
+  @Override
   public boolean isTextArea(
     FacesBean bean)
   {
     return false;
   }
 
+  @Override
   protected boolean getSecret(FacesBean bean)
   {
     return false;
@@ -332,6 +342,7 @@
    * We want onclick to move from the input field to the button;
    * @see #getButtonOnclick
    */
+  @Override
   protected String getOnclick(FacesBean bean)
   {
     return null;
@@ -360,11 +371,13 @@
     return toUri(bean.getProperty(_iconKey));
   }
 
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputListOfValues";
   }
 
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|inputListOfValues::content";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.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/SimpleInputTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Sun Aug  6 16:12:37 2006
@@ -47,6 +47,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -59,7 +60,7 @@
 
   }
 
-
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -86,7 +87,7 @@
     return submitted;
   }
 
-
+  @Override
   protected void encodeAllAsElement(
     FacesContext        context,
     RenderingContext arc,
@@ -152,6 +153,7 @@
 
   }    
        
+  @Override
   protected void renderAllAttributes(
     FacesContext        context,
     RenderingContext arc,
@@ -240,11 +242,13 @@
 
   }
   
+  @Override
   protected String getContentStyleClass(FacesBean bean)  
   {
     return "af|inputText::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputText";
@@ -280,6 +284,7 @@
   /**
    * Renders event handlers for the node.
    */
+  @Override
   protected void renderEventHandlers(
     FacesContext context,
     FacesBean    bean) throws IOException
@@ -290,6 +295,7 @@
     rw.writeAttribute("onselect", getOnselect(bean), "onselect");
   }
 
+  @Override
   protected void encodeAllAsNonElement(
     FacesContext        context,
     RenderingContext arc,
@@ -331,6 +337,7 @@
   /**
    * @todo Remove if never necessary
    */
+  @Override
   protected void renderNonElementContent(
     FacesContext        context,
     RenderingContext arc,
@@ -510,7 +517,7 @@
     }
   }
 
-
+  @Override
   protected String getOnkeypress(
     FacesBean bean
     )
@@ -529,7 +536,7 @@
     return onKeyPress;
   }
 
-
+  @Override
   protected String getOnkeydown(FacesBean bean)
   {
     String onKeydown = super.getOnkeydown(bean);
@@ -546,6 +553,7 @@
   /**
    * @todo We have to "getCurrentInstance()" *twice*.  UGH!
    */
+  @Override
   protected String getOnfocus(FacesBean bean)
   {
     String onfocus = super.getOnfocus(bean);
@@ -558,15 +566,16 @@
       RenderingContext arc = RenderingContext.getCurrentInstance();
       if (!supportsReadonlyFormElements(arc))
       {
-        onfocus = (String) XhtmlUtils.getChainedJS("this.blur()",
-                                                   onfocus,
-                                                   true);
+        onfocus = XhtmlUtils.getChainedJS("this.blur()",
+                                          onfocus,
+                                          true);
       }
     }
 
     return onfocus;
   }
 
+  @Override
   protected String getOnchange(
     FacesBean bean
     )
@@ -641,6 +650,9 @@
   /**
    * @todo - Find a efficient way to identify that this is a numeric field
    */
+  //-= Simon Lessard =-
+  //TODO:  This method is not even used locally
+  @SuppressWarnings("unused")
   private boolean _isNumericField(
 //    FacesBean bean
     )
@@ -664,6 +676,7 @@
   /**
    * @todo RENABLE ONFOCUS HACK
    */
+  @Override
   protected boolean renderReadOnlyAsElement(
     RenderingContext arc,
     FacesBean           bean)
@@ -721,7 +734,7 @@
     if (userFunc == null)
       return functionCall;
 
-    return (String) XhtmlUtils.getChainedJS(functionCall, userFunc, true);
+    return XhtmlUtils.getChainedJS(functionCall, userFunc, true);
   }
 
   /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.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/SimpleSelectBooleanCheckboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanCheckboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -40,6 +40,7 @@
   //decode
   //**********************
   
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -55,17 +56,20 @@
   //encode
   //**********************
 
+  @Override
   protected Object getValueAttr(RenderingContext arc)
   {
     // HTML 3.2 specification, default value for checkboxes
     return "t";
   }
 
+  @Override
   protected Object getType()
   {
     return "checkbox";
   }
 
+  @Override
   protected String getIconAltTextName(
     boolean selected
   )
@@ -75,6 +79,7 @@
       : "af_selectBooleanCheckbox.READONLY_NOT_CHECKED_TIP");
   }
   
+  @Override
   protected String getIconName(
     boolean selected,
     boolean disabled
@@ -97,7 +102,7 @@
     return iconName;           
   }
   
-
+  @Override
   protected String getOnclick(
     FacesBean bean
     )
@@ -115,11 +120,13 @@
     return onClick;
   }  
   
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
    return "af|selectBooleanCheckbox::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)
   {
    return "af|selectBooleanCheckbox";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.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/SimpleSelectBooleanRadioRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRadioRenderer.java Sun Aug  6 16:12:37 2006
@@ -39,6 +39,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -49,6 +50,7 @@
   //decode
   //**********************
   
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -71,16 +73,19 @@
   //encode
   //**********************
 
+  @Override
   protected Object getValueAttr(RenderingContext arc)
   {
     return arc.getCurrentClientId();
   }
 
+  @Override
   protected Object getType()
   {
     return "radio";
   }
 
+  @Override
   protected String getIconAltTextName(
     boolean selected
   )
@@ -90,6 +95,7 @@
       : "af_selectBooleanRadio.READONLY_NOT_CHECKED_TIP");
   }
   
+  @Override
   protected String getIconName(
     boolean selected,
     boolean disabled
@@ -113,6 +119,7 @@
     return iconName;           
   }
 
+  @Override
   protected void renderNameAttribute(
     FacesContext        context,
     RenderingContext arc,
@@ -131,26 +138,27 @@
    * Returns true if the component should render the ID as a name.
    * By default, don't if the component is readonly.
    */
+  @Override
   protected boolean shouldRenderName(
     FacesContext context,
     UIComponent  component)
   {
     return false;
   }
-
-
+  
+  @Override
   protected boolean isRadio()
   {
     return true;
   }
 
-
+  @Override
   protected String getCompositeId(String clientId)
   {
     return clientId + XhtmlConstants.COMPOSITE_ID_EXTENSION + "r";   
   }
   
-
+  @Override
   protected void renderSpanEventHandlers(
     FacesContext context, 
     FacesBean    bean) throws IOException
@@ -170,6 +178,7 @@
     rw.writeAttribute("onmouseup", getOnmouseup(bean),  "onmouseup");
   }
   
+  @Override
   protected void renderInputEventHandlers(
     FacesContext context, 
     FacesBean    bean) throws IOException
@@ -186,11 +195,13 @@
     return toString(bean.getProperty(_groupKey));
   }
   
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
    return "af|selectBooleanRadio::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)
   {
    return "af|selectBooleanRadio";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.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/SimpleSelectBooleanRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectBooleanRenderer.java Sun Aug  6 16:12:37 2006
@@ -37,6 +37,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -77,6 +78,7 @@
    * @TODO use new renderAllAttributes that doesn't render styleclass once
    * Jeanne adds it.
    */
+  @Override
   protected void encodeAllAsElement(
     FacesContext        context,
     RenderingContext arc,
@@ -172,7 +174,7 @@
       writer.endElement("span");      
   }
 
-
+  @Override
   protected void encodeAllAsNonElement(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.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/SimpleSelectManyCheckboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -44,6 +44,7 @@
     super(CoreSelectManyCheckbox.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -55,12 +56,13 @@
   //
   // ENCODE BEHAVIOR
   //
+  @Override
   protected void encodeElementContent(
     FacesContext        context,
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int[]               selectedIndices,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -108,7 +110,7 @@
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int[]               selectedIndices,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -141,7 +143,7 @@
       if (selected)
         selectedEntry++;
 
-      SelectItem item = (SelectItem) selectItems.get(i);
+      SelectItem item = selectItems.get(i);
       if (encodeSelectItem(context, arc, component, item, converter,
                            valuePassThru, accessKey,
                            i, selected, disabled,
@@ -237,6 +239,7 @@
     return true;
   }
 
+  @Override
   protected void renderBetweenNonElements(
     FacesContext        context,
     RenderingContext arc,
@@ -249,6 +252,7 @@
       super.renderBetweenNonElements(context, arc, component, bean);
   }
 
+  @Override
   protected void renderId(
     FacesContext context,
     UIComponent  component) throws IOException
@@ -265,6 +269,7 @@
    * In Gecko, they bubble up, but in IE, they don't, so
    * they have to go on the items.
    */
+  @Override
   protected void renderFormEventHandlers(
     FacesContext context,
     FacesBean    bean) throws IOException
@@ -276,6 +281,7 @@
    * Disable rendering "onclick" on the parent;  it needs to
    * go on the individual radio buttons
    */
+  @Override
   protected String getOnclick(
     FacesBean bean
     )
@@ -328,15 +334,19 @@
 
   // Never render the "hidden label";  labels entirely go on the individual
   // items
+  @Override
   protected boolean isHiddenLabelRequired(RenderingContext arc)
   {
     return false;
   } 
+  
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
    return "af|selectManyCheckbox::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)
   {
    return "af|selectManyCheckbox";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.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/SimpleSelectManyListboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyListboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -46,18 +46,20 @@
     super(CoreSelectManyListbox.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _sizeKey = type.findKey("size");
   }
 
+  @Override
   protected void encodeElementContent(
     FacesContext        context,
-    RenderingContext arc,
+    RenderingContext    arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int[]               selectedIndices,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -83,7 +85,7 @@
       if (selected)
         selectedEntry++;
 
-      SelectItem item = (SelectItem) selectItems.get(i);
+      SelectItem item = selectItems.get(i);
       SimpleSelectOneRenderer.encodeOption(
            context, arc, component, item, converter,
            valuePassThru, i, selected);
@@ -96,6 +98,7 @@
   /**
    * Add autosubmit script
    */
+  @Override
   protected String getOnchange(
     FacesBean bean
     )
@@ -124,11 +127,13 @@
     return toInt(o);
   }
   
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|selectManyListbox::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectManyListbox";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.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/SimpleSelectManyRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java Sun Aug  6 16:12:37 2006
@@ -57,6 +57,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -70,6 +71,7 @@
    * @todo This throws a ConverterException on the first unconvertable
    *  value;  it should wait
    */
+  @Override
   public Object getConvertedValue(
     FacesContext context,
     UIComponent  component,
@@ -88,7 +90,7 @@
     if ( converter == null)
       converter = getDefaultConverter(context, bean);
 
-    Class modelClass = null;
+    Class<?> modelClass = null;
     ValueBinding binding = getValueBinding(bean);
     if (binding != null)
     {
@@ -115,8 +117,7 @@
     }
   }
 
-
-
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -137,6 +138,7 @@
    * Override to return a Converter for the items in the value,
    * not the value itself.
    */
+  @Override
   protected Converter getDefaultConverter(
     FacesContext context,
     FacesBean    bean)
@@ -145,13 +147,13 @@
     if (binding == null)
       return null;
 
-    Class type = binding.getType(context);
+    Class<?> type = binding.getType(context);
     if ((type == null) || type.isAssignableFrom(List.class))
       return null;
 
     if (type.isArray())
     {
-      Class itemClass = type.getComponentType();
+      Class<?> itemClass = type.getComponentType();
       return ConverterUtils.createConverter(context, itemClass);
     }
 
@@ -165,7 +167,7 @@
     UIComponent  component,
     Converter    converter,
     String[]     values,
-    Class        modelClass) throws ConverterException
+    Class<?>     modelClass) throws ConverterException
   {
     // Handle lists
     if ((modelClass == null) || modelClass.isAssignableFrom(List.class))
@@ -173,7 +175,7 @@
       if (converter == null)
         return Arrays.asList(values);
 
-      ArrayList newList = new ArrayList(values.length);
+      ArrayList<Object> newList = new ArrayList<Object>(values.length);
       for (int i = 0; i < values.length; i++)
       {
         // Note - any error will result in an immediate ConverterException
@@ -188,7 +190,7 @@
       if (converter == null)
         return values;
 
-      Class itemClass = modelClass.getComponentType();
+      Class<?> itemClass = modelClass.getComponentType();
       Object convertedArray = Array.newInstance(itemClass, values.length);
       for (int i = 0; i < values.length; i++)
       {
@@ -222,9 +224,10 @@
     UIComponent  component,
     Converter    converter,
     String[]     values,
-    Class        modelClass) throws ConverterException
+    Class<?>     modelClass) throws ConverterException
   {
-    List selectItems = SelectItemSupport.getSelectItems(component, converter);
+    List<SelectItem> selectItems = 
+      SelectItemSupport.getSelectItems(component, converter);
 
     // No selectItems automatically means that we failed to convert
     if ((selectItems == null) || (selectItems.isEmpty()))
@@ -233,7 +236,7 @@
       _throwConversionError(context, component);
     }
 
-    assert (values instanceof String[]);
+    // -= Simon Lessard =- Useless assertion: assert (values instanceof String[]);
 
     // OK, is this a List or an array?
     boolean isList = ((modelClass == null) ||
@@ -247,17 +250,17 @@
 
 
     // Create either a List or array
-    List     objectList;
-    Object   objectArray;
+    List<Object> objectList;
+    Object       objectArray;
     if (isList)
     {
-      objectList = new ArrayList(values.length);
+      objectList = new ArrayList<Object>(values.length);
       objectArray = null;
     }
     else
     {
       objectList = null;
-      Class itemClass = modelClass.getComponentType();
+      Class<?> itemClass = modelClass.getComponentType();
       // Use Array API instead of Object[] to support primitive types
       objectArray = Array.newInstance(itemClass, values.length);
     }
@@ -273,7 +276,7 @@
 
         if (( -1 < index) && (selectItems.size() > index))
         {
-          SelectItem item = (SelectItem)selectItems.get(index);
+          SelectItem item = selectItems.get(index);
           if (item == null)
             continue;
 
@@ -301,7 +304,7 @@
       return objectArray;
   }
 
-
+  @Override
   protected void encodeAllAsElement(
     FacesContext        context,
     RenderingContext arc,
@@ -330,7 +333,7 @@
                       getRequiredMessageKey());
     }
 
-    List selectItems = SelectItemSupport.getSelectItems(component, converter);
+    List<SelectItem> selectItems = SelectItemSupport.getSelectItems(component, converter);
     int selectedIndices[] = _getSelectedIndices(context,
                                                 component,
                                                 bean,
@@ -379,11 +382,12 @@
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int[]               selectedIndices,
     Converter           converter,
     boolean             valuePassThru) throws IOException;
 
+  @Override
   protected void renderNonElementContent(
     FacesContext        context,
     RenderingContext arc,
@@ -398,7 +402,9 @@
     // =-=AEW If needed, this could be made more efficient
     // by iterating through the list instead of getting
     // all the items
-    List selectItems = SelectItemSupport.getSelectItems(component, converter);
+    List<SelectItem> selectItems = 
+      SelectItemSupport.getSelectItems(component, converter);
+    
     int selectedIndices[] = _getSelectedIndices(context,
                                                 component,
                                                 bean,
@@ -414,7 +420,7 @@
         renderBetweenNonElements(context, arc, component, bean);
       }
 
-      SelectItem item = (SelectItem) selectItems.get(selectedIndices[i]);
+      SelectItem item = selectItems.get(selectedIndices[i]);
       rw.writeText(item.getLabel(), null);
     }
   }
@@ -430,13 +436,12 @@
     rw.endElement("br");
   }
 
-
+  @Override
   protected String getRequiredMessageKey()
   {
     return UIXSelectMany.REQUIRED_MESSAGE_ID;
   }
 
-
   protected boolean getValuePassThru(FacesBean bean)
   {
     Object o = bean.getProperty(_valuePassThruKey);
@@ -451,11 +456,12 @@
    * Return all the selected indices, in sorted order.  (There
    * may be trailing -1's in case of an error)
    */
+  @SuppressWarnings("unchecked")
   private int[] _getSelectedIndices(
     FacesContext        context,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     Converter           converter,
     boolean             valuePassThru)
   {
@@ -495,7 +501,7 @@
       else
       {
         String[] values = (String[]) submittedValue;
-        List valuesList = new ArrayList(values.length);
+        List<Object> valuesList = new ArrayList<Object>(values.length);
         for (int i = 0; i < values.length; i++)
         {
           valuesList.add(converter.getAsObject(context,
@@ -511,16 +517,16 @@
       return _EMPTY_INT_ARRAY;
 
     // Now, get the value looking like a list
-    List valueList;
+    List<Object> valueList;
     if (value instanceof List)
     {
       // Make a copy of the list so we can mutate it safely
-      valueList = new ArrayList((List) value);
+      valueList = new ArrayList<Object>((List<Object>) value);
     }
     else if (value.getClass().isArray())
     {
       int length = Array.getLength(value);
-      valueList = new ArrayList(length);
+      valueList = new ArrayList<Object>(length);
       for (int i = 0; i < length; i++)
       {
         valueList.add(Array.get(value, i));
@@ -529,7 +535,7 @@
     else
     {
       // Let's just take the one value as a single element
-      valueList = new ArrayList(1);
+      valueList = new ArrayList<Object>(1);
       valueList.add(value);
     }
 
@@ -540,7 +546,7 @@
     int lastEntry = 0;
     for (int i = 0; i < itemCount; i++)
     {
-      SelectItem item = (SelectItem) selectItems.get(i);
+      SelectItem item = selectItems.get(i);
       if (item == null)
         continue;
 
@@ -595,7 +601,7 @@
 
 
   static private void _throwUnsupportedModelType(
-    FacesContext context, Class type, UIComponent component)
+    FacesContext context, Class<?> type, UIComponent component)
       throws ConverterException
   {
     throw new ConverterException(

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.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/SimpleSelectOneChoiceRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneChoiceRenderer.java Sun Aug  6 16:12:37 2006
@@ -42,22 +42,23 @@
     super(CoreSelectOneChoice.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _unselectedLabelKey = type.findKey("unselectedLabel");
   }
 
-
   //
   // ENCODE BEHAVIOR
   // 
+  @Override
   protected void encodeElementContent(
     FacesContext        context,
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int                 selectedIndex,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -79,7 +80,7 @@
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int                 selectedIndex,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -116,7 +117,7 @@
 
     for (int i = 0; i < size; i++)
     {
-      SelectItem item = (SelectItem) selectItems.get(i);
+      SelectItem item = selectItems.get(i);
       encodeOption(context, arc, component, item, converter,
                    valuePassThru, i, selectedIndex == i);
     }
@@ -127,6 +128,7 @@
   /**
    * In Internet Explorer, handle autosubmit.
    */
+  @Override
   protected String getOnclick(
     FacesBean bean)
   {
@@ -155,6 +157,7 @@
   /**
    * In Internet Explorer, handle autosubmit.
    */
+  @Override
   protected String getOnblur(
     FacesBean bean)
   {
@@ -175,6 +178,7 @@
   /**
    * Add autosubmit script, and autosync script.
    */
+  @Override
   protected String getOnchange(
     FacesBean bean
     )
@@ -207,16 +211,19 @@
     return XhtmlUtils.getChainedJS(onchange, auto, true);
   }
 
+  @Override
   protected String getUnselectedLabel(FacesBean bean)
   {
     return toString(bean.getProperty(_unselectedLabelKey));
   }
   
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|selectOneChoice::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectOneChoice";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.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/SimpleSelectOneListboxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneListboxRenderer.java Sun Aug  6 16:12:37 2006
@@ -43,6 +43,7 @@
     super(CoreSelectOneListbox.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -71,12 +72,13 @@
   //
   // ENCODE BEHAVIOR
   // 
+  @Override
   protected void encodeElementContent(
     FacesContext        context,
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int                 selectedIndex,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -104,7 +106,7 @@
 
     for (int i = 0; i < count; i++)
     {
-      SelectItem item = (SelectItem) selectItems.get(i);
+      SelectItem item = selectItems.get(i);
       encodeOption(context, arc, component, item, converter,
                    valuePassThru, i, selectedIndex == i);
     }
@@ -112,6 +114,7 @@
     writer.endElement("select");
   }
 
+  @Override
   protected String getUnselectedLabel(FacesBean bean)
   {
     return toString(bean.getProperty(_unselectedLabelKey));
@@ -120,6 +123,7 @@
   /**
    * Add autosubmit script
    */
+  @Override
   protected String getOnchange(
     FacesBean bean
     )
@@ -146,11 +150,13 @@
     return toInt(o);
   }
   
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|selectOneListbox::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectOneListbox";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.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/SimpleSelectOneRadioRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java Sun Aug  6 16:12:37 2006
@@ -44,6 +44,7 @@
     super(CoreSelectOneRadio.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -56,12 +57,13 @@
   //
   // ENCODE BEHAVIOR
   //
+  @Override
   protected void encodeElementContent(
     FacesContext        context,
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int                 selectedIndex,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -109,7 +111,7 @@
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int                 selectedIndex,
     Converter           converter,
     boolean             valuePassThru) throws IOException
@@ -144,7 +146,7 @@
 
     for (int i = 0; i < size; i++)
     {
-      SelectItem item = (SelectItem) selectItems.get(i);
+      SelectItem item = selectItems.get(i);
       if (encodeSelectItem(context, arc, component, item, converter,
                            valuePassThru, accessKey,
                            i, selectedIndex == i, disabled,
@@ -240,6 +242,7 @@
     return true;
   }
 
+  @Override
   protected void renderId(
     FacesContext context,
     UIComponent  component) throws IOException
@@ -256,6 +259,7 @@
    * In Gecko, they bubble up, but in IE, they don't, so
    * they have to go on the items.
    */
+  @Override
   protected void renderFormEventHandlers(
     FacesContext context,
     FacesBean    bean) throws IOException
@@ -267,6 +271,7 @@
    * Disable rendering "onclick" on the parent;  it needs to
    * go on the individual radio buttons
    */
+  @Override
   protected String getOnclick(
     FacesBean bean
     )
@@ -317,6 +322,7 @@
     return toString(bean.getProperty(_layoutKey));
   }
 
+  @Override
   protected String getUnselectedLabel(FacesBean bean)
   {
     return toString(bean.getProperty(_unselectedLabelKey));
@@ -324,16 +330,19 @@
 
   // Never render the "hidden label";  labels entirely go on the individual
   // items
+  @Override
   protected boolean isHiddenLabelRequired(RenderingContext arc)
   {
     return false;
   }
    
+  @Override
   protected String getContentStyleClass(FacesBean bean)
   {
     return "af|selectOneRadio::content";
   }
   
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|selectOneRadio";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.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/SimpleSelectOneRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java Sun Aug  6 16:12:37 2006
@@ -48,13 +48,14 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _valuePassThruKey = type.findKey("valuePassThru");
   }
 
-
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -160,6 +161,7 @@
   //
   // DECODE BEHAVIOR
   //
+  @Override
   public Object getConvertedValue(
     FacesContext context,
     UIComponent  component,
@@ -200,13 +202,14 @@
     if ( converter == null)
       converter = getDefaultConverter(context, bean);
 
-    List selectItems = SelectItemSupport.getSelectItems(component, converter);
+    List<SelectItem> selectItems =
+      SelectItemSupport.getSelectItems(component, converter);
+    
     int index = __getIndex(submittedValue, selectItems);
     if (index < 0)
       return null;
 
-    SelectItem item =
-      (SelectItem) selectItems.get(index);
+    SelectItem item = selectItems.get(index);
     if (item != null)
       return item.getValue();
     else
@@ -219,9 +222,10 @@
   //
   /*
    */
+  @Override
   protected void encodeAllAsElement(
     FacesContext        context,
-    RenderingContext arc,
+    RenderingContext    arc,
     UIComponent         component,
     FacesBean           bean) throws IOException
   {
@@ -247,7 +251,9 @@
                       getRequiredMessageKey());
     }
 
-    List selectItems = SelectItemSupport.getSelectItems(component, converter);
+    List<SelectItem> selectItems = 
+      SelectItemSupport.getSelectItems(component, converter);
+    
     int selectedIndex = _getSelectedIndex(context,
                                           component,
                                           bean,
@@ -290,11 +296,12 @@
     RenderingContext arc,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     int                 selectedIndex,
     Converter           converter,
     boolean             valuePassThru) throws IOException;
 
+  @Override
   protected void renderNonElementContent(
     FacesContext        context,
     RenderingContext arc,
@@ -309,7 +316,9 @@
     // =-=AEW If needed, this could be made more efficient
     // by iterating through the list instead of getting
     // all the items
-    List selectItems = SelectItemSupport.getSelectItems(component, converter);
+    List<SelectItem> selectItems = 
+      SelectItemSupport.getSelectItems(component, converter);
+    
     int selectedIndex = _getSelectedIndex(context,
                                           component,
                                           bean,
@@ -321,7 +330,7 @@
     String text;
     if (selectedIndex >= 0)
     {
-      SelectItem item = (SelectItem) selectItems.get(selectedIndex);
+      SelectItem item = selectItems.get(selectedIndex);
       text = item.getLabel();
     }
     else
@@ -332,13 +341,12 @@
     context.getResponseWriter().writeText(text, null);
   }
 
-
+  @Override
   protected String getRequiredMessageKey()
   {
     return UIXSelectOne.REQUIRED_MESSAGE_ID;
   }
 
-
   protected boolean getValuePassThru(FacesBean bean)
   {
     Object o = bean.getProperty(_valuePassThruKey);
@@ -359,7 +367,9 @@
   /**
    * Convert a stringified index into an index, with range-checking.
    */
-  static int __getIndex(Object submittedValue, List selectItems)
+  static int __getIndex(
+      Object submittedValue, 
+      List<SelectItem> selectItems)
   {
     if ("".equals(submittedValue))
       return -1;
@@ -393,12 +403,14 @@
   //
   // Find the selected item in the list
   //
-  private int _findIndex(Object value, List selectItems)
+  private int _findIndex(
+      Object value, 
+      List<SelectItem> selectItems)
   {
     int size = selectItems.size();
     for (int i = 0; i < size; i++)
     {
-      SelectItem item = (SelectItem) selectItems.get(i);
+      SelectItem item = selectItems.get(i);
       if (item == null)
         continue;
 
@@ -434,7 +446,7 @@
     FacesContext        context,
     UIComponent         component,
     FacesBean           bean,
-    List                selectItems,
+    List<SelectItem>    selectItems,
     Converter           converter,
     boolean             valuePassThru)
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.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/SpacerRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SpacerRenderer.java Sun Aug  6 16:12:37 2006
@@ -34,6 +34,7 @@
     super(CoreSpacer.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -41,6 +42,7 @@
     _widthKey = type.findKey("width");
   }
 
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.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/StyleSheetRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java Sun Aug  6 16:12:37 2006
@@ -66,12 +66,13 @@
     super(type);
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
-
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -140,7 +141,9 @@
       {
         if (arc instanceof CoreRenderingContext)
         {
-          Map shortStyles = StyleUtils.getShortStyleClasses(sContext, provider);
+          Map<String, String> shortStyles = 
+            StyleUtils.getShortStyleClasses(sContext, provider);
+          
           ((CoreRenderingContext) arc).setStyleMap(shortStyles);
         }
       }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.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/TableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java Sun Aug  6 16:12:37 2006
@@ -67,6 +67,7 @@
     _resourceKeyMap = createResourceKeyMap();
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -75,19 +76,22 @@
     _emptyTextKey  = type.findKey("emptyText");
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
-
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
     decodeSelection(context, component);
 
-    Map parameters =  context.getExternalContext().getRequestParameterMap();
-    Object source = parameters.get(XhtmlConstants.SOURCE_PARAM);
+    Map<String, String> parameters =  
+      context.getExternalContext().getRequestParameterMap();
+    
+    String source = parameters.get(XhtmlConstants.SOURCE_PARAM);
     String id = component.getClientId(context);
     if (!id.equals(source))
       return;
@@ -141,9 +145,9 @@
   }
    private void _decodeSort(
     UIXTable table,
-    Map parameters)
+    Map<String, String> parameters)
   {
-    String property = (String) parameters.get(XhtmlConstants.VALUE_PARAM);
+    String property = parameters.get(XhtmlConstants.VALUE_PARAM);
     Object state = parameters.get(XhtmlConstants.STATE_PARAM);
     boolean sortOrder = !XhtmlConstants.SORTABLE_ASCENDING.equals(state);
     SortCriterion criterion = new SortCriterion(property, sortOrder);
@@ -155,9 +159,9 @@
 
   private void _decodeGoto(
     UIXTable table,
-    Map parameters)
+    Map<String, String> parameters)
   {
-    String value = (String) parameters.get(XhtmlConstants.VALUE_PARAM);
+    String value = parameters.get(XhtmlConstants.VALUE_PARAM);
     if (value != null)
     {
       final FacesEvent event;
@@ -190,17 +194,18 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   private void _decodeHideShow(
     UIXTable table,
-    Map parameters,
+    Map<String, String> parameters,
     Object eventParam)
   {
     boolean doExpand = XhtmlConstants.SHOW_EVENT.equals(eventParam);
     Object value = parameters.get(XhtmlConstants.VALUE_PARAM);
     if (value != null)
     {
-      RowKeySet old = table.getDisclosedRowKeys();
-      RowKeySet newset = old.clone();
+      RowKeySet<Object> old = table.getDisclosedRowKeys();
+      RowKeySet<Object> newset = old.clone();
       if ("all".equals(value))
       {
         if (doExpand)
@@ -223,6 +228,7 @@
     }
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -230,7 +236,7 @@
     FacesBean           bean) throws IOException
   {
     // save current skin resource map, if any, on the local property
-    Map oldSkinResourceMap = arc.getSkinResourceKeyMap();
+    Map<String, String> oldSkinResourceMap = arc.getSkinResourceKeyMap();
 
     // store TableRenderer's skin resource map, so that called to
     // context.getTranslatedValue will get the correct key.
@@ -456,6 +462,7 @@
    * used to render special column headers, like select and details.
    * @return the next physicalColumnIndex
    */
+  @SuppressWarnings("unchecked")
   protected int renderSpecialColumns(
     FacesContext          context,
     RenderingContext   arc,
@@ -468,7 +475,7 @@
     // depending on the RenderStage
     final ColumnData colData = tContext.getColumnData();
     int[] hidden = tContext.getHiddenColumns();
-    List children = treeTable.getChildren();
+    List<UIComponent> children = treeTable.getChildren();
     int colCount  = children.size();
     for (int i = 0;  i < colCount;  i++)
     {
@@ -529,7 +536,7 @@
     RenderingContext   arc,
     TableRenderingContext tContext) throws IOException
   {
-    Map originalResourceKeyMap = arc.getSkinResourceKeyMap();
+    Map<String, String> originalResourceKeyMap = arc.getSkinResourceKeyMap();
     setSelectionResourceKeyMap(arc, tContext);
     try
     {
@@ -717,7 +724,9 @@
   {
     if (tContext.hasSelection())
     {
-      Map selectionColumnStylesMap = new HashMap();
+      Map<String, String> selectionColumnStylesMap = 
+        new HashMap<String, String>();
+      
       // if selection is multiple-selection:
       if (tContext.hasSelectAll())
       {
@@ -738,12 +747,13 @@
 
   }
 
+  @Override
   protected boolean shouldRenderId(FacesContext context, UIComponent component)
   {
     return true;
   }
 
-  protected Map createResourceKeyMap()
+  protected Map<String, String> createResourceKeyMap()
   {
     // map the skin resource keys that are used in components used
     // by the table renderer to table keys.
@@ -751,7 +761,7 @@
     // components that it uses within it. For example, we can customize
     // af_table.DISCLOSED translation key
     // separately from af_showDetail.DISCLOSED.
-    Map map = new HashMap(6);
+    Map<String, String> map = new HashMap<String, String>(6);
     map.put("af_showDetail.DISCLOSED",
             "af_table.DISCLOSED");
     map.put("af_showDetail.UNDISCLOSED",
@@ -786,11 +796,13 @@
       super(type);
     }
 
+    @Override
     protected void renderAllAttributes(
       FacesContext context, RenderingContext arc, FacesBean bean)
     {
     }
 
+    @Override
     protected boolean getShowAll(FacesBean bean)
     {
       TableRenderingContext tContext =
@@ -806,6 +818,7 @@
     }
 
     // For now, disable showAll except on UIXTable
+    @Override
     protected boolean showAllSupported()
     {
       TableRenderingContext tContext =
@@ -815,6 +828,7 @@
       }
 
 
+    @Override
     protected String getSource()
     {
       TableRenderingContext tContext =
@@ -825,6 +839,7 @@
     /**
      * @todo Deal with repeating!
      */
+    @Override
     protected String getClientId(FacesContext context, UIComponent component)
     {
       TableRenderingContext tContext =
@@ -832,52 +847,62 @@
       return tContext.getTableId() + "-nb";
     }
 
+    @Override
     protected String getVar(FacesBean bean)
     {
       return null;
     }
 
     // No support for range labels
+    @Override
     protected UIComponent getRangeLabel(UIComponent component)
     {
       return null;
     }
 
+    @Override
     protected int getRowCount(UIComponent component)
     {
       return ((CollectionComponent) component).getRowCount();
     }
 
+    @Override
     protected int getRowIndex(UIComponent component)
     {
       return ((CollectionComponent) component).getRowIndex();
     }
 
+    @Override
     protected void setRowIndex(UIComponent component, int index)
     {
       ((CollectionComponent) component).setRowIndex(index);
     }
 
+    @Override
     protected boolean isRowAvailable(UIComponent component)
     {
       return ((CollectionComponent) component).isRowAvailable();
     }
 
+    @Override
     protected boolean isRowAvailable(UIComponent component, int rowIndex)
     {
       return ((UIXCollection) component).isRowAvailable(rowIndex);
     }
 
+    @Override
     protected Object getRowData(UIComponent component)
     {
       return ((CollectionComponent) component).getRowData();
     }
 
+    @Override
     protected int getRows(UIComponent component, FacesBean bean)
     {
       return ((CollectionComponent) component).getRows();
     }
 
+    @Override
     protected int getFirst(UIComponent component, FacesBean bean)
     {
       return ((CollectionComponent) component).getFirst();
@@ -887,7 +912,7 @@
 
   private PropertyKey _widthKey;
   private PropertyKey _emptyTextKey;
-  private final Map _resourceKeyMap;
+  private final Map<String, String> _resourceKeyMap;
 
   // Key for RenderingContext property used to store the generated ID
   // to use for the upper navigation bar.  (Part of fix for 2275703.)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.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/ValueRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java Sun Aug  6 16:12:37 2006
@@ -32,6 +32,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -69,7 +70,7 @@
     if (binding == null)
       return null;
 
-    Class type = binding.getType(context);
+    Class<?> type = binding.getType(context);
     return ConverterUtils.createConverter(context, type);
   }
 



Mime
View raw message