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 [10/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/c...
Date Sun, 06 Aug 2006 23:12:54 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PollRenderer.java Sun Aug  6 16:12:37 2006
@@ -34,9 +34,13 @@
  */
 public class PollRenderer extends UINodeRendererBase
 {
+  @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(UIConstants.EVENT_PARAM);
     if (UIConstants.POLL_EVENT.equals(event))
     {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProcessRenderer.java Sun Aug  6 16:12:37 2006
@@ -39,9 +39,12 @@
 {
   /**
    */
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
-    Map requestMap = context.getExternalContext().getRequestParameterMap();
+    Map<String, String> requestMap = 
+      context.getExternalContext().getRequestParameterMap();
 
     Object event = requestMap.get("event");
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/ProgressRenderer.java Sun Aug  6 16:12:37 2006
@@ -39,10 +39,12 @@
  */
 public class ProgressRenderer extends UINodeRendererBase
 {
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
     UIXProgress progressComponent = (UIXProgress)component;
-    Map attrs = component.getAttributes();
+    Map<String, Object> attrs = component.getAttributes();
 
     Object modelValue= attrs.get(UIConstants.VALUE_PARAM);
     if (modelValue instanceof BoundedRangeModel)
@@ -61,11 +63,13 @@
     }
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void encodeBegin(FacesContext context, UIComponent component)
     throws IOException
   {
     //pu: This seems to be the best place to validate the model for the value
-    Map attrs = component.getAttributes();
+    Map<String, Object> attrs = component.getAttributes();
     Object modelObject = attrs.get(UIConstants.VALUE_PARAM);
     if (modelObject == null || !(modelObject instanceof BoundedRangeModel))
     {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java Sun Aug  6 16:12:37 2006
@@ -52,7 +52,8 @@
    *         java.util.Collections.EMPTY_LIST if component has no children or
    *         the component isn't a javax.faces.component.ValueHolder. else
    */
-  static public List getSelectItems(
+  @SuppressWarnings("unchecked")
+  static public List<SelectItem> getSelectItems(
     UIComponent  component,
     Converter    converter)
   { 
@@ -67,16 +68,14 @@
       return Collections.EMPTY_LIST;
 
     FacesContext context = FacesContext.getCurrentInstance();
-    List items = null;
-    List children = component.getChildren();
-    for (int i = 0; i < childCount; i++)
+    List<SelectItem> items = null;
+    for(UIComponent child : (List<UIComponent>)component.getChildren())
     {
-      UIComponent child = (UIComponent) children.get(i);
       // f:selectItem
       if (child instanceof UISelectItem)
       {
         if (items == null)
-          items = new ArrayList(childCount);
+          items = new ArrayList<SelectItem>(childCount);
         _addSelectItem(context, 
                        component, 
                        (UISelectItem) child, 
@@ -87,14 +86,14 @@
       else if (child instanceof UISelectItems)
       {
         if (items == null)
-          items = new ArrayList(childCount);
+          items = new ArrayList<SelectItem>(childCount);
         addSelectItems((UISelectItems) child, items);
       }
       // tr:selectItem
       else if (child instanceof UIXSelectItem)
       {
         if (items == null)
-          items = new ArrayList(childCount);
+          items = new ArrayList<SelectItem>(childCount);
         _addUIXSelectItem(context,
                           component,
                           (UIXSelectItem) child, 
@@ -117,6 +116,7 @@
    * @param component  UIComponent
    * @return item count
    */
+  @SuppressWarnings("unchecked")
   static public int getSelectItemCount(
     UIComponent  component)
   { 
@@ -130,11 +130,8 @@
     if (!(component instanceof ValueHolder))
       return itemCount;
 
-    List children = component.getChildren();
-    for (int i = 0; i < childCount; i++)
+    for(UIComponent child : (List<UIComponent>)component.getChildren())
     {
-      UIComponent child = (UIComponent) children.get(i);
-      
       if (child instanceof UISelectItem ||
           child instanceof UIXSelectItem)
       {
@@ -185,11 +182,11 @@
    *                   itemValue is a String.
    */
   static private void _addSelectItem(
-    FacesContext  context,
-    UIComponent   component,
-    UISelectItem  uiItem,
-    List          items,
-    Converter     converter)
+    FacesContext     context,
+    UIComponent      component,
+    UISelectItem     uiItem,
+    List<SelectItem> items,
+    Converter        converter)
   {
     if (!uiItem.isRendered())
     {
@@ -230,8 +227,8 @@
    * a UISelectItem component into the items List.
    */
   static public void addSelectItem(
-    UISelectItem  uiItem,
-    List          items)
+    UISelectItem     uiItem,
+    List<SelectItem> items)
   {
     Object value = uiItem.getValue();
     SelectItem item;
@@ -259,9 +256,10 @@
    * Adds SelectItem objects derived from
    * a UISelectItems component into the items List.
    */
+  @SuppressWarnings("unchecked")
   static public void addSelectItems(
     UISelectItems uiItems,
-    List          items)
+    List<SelectItem> items)
   {
     if (!uiItems.isRendered())
     {
@@ -284,18 +282,16 @@
     }
     else if (value instanceof Collection)
     {
-      Iterator iter = ((Collection) value).iterator();
+      Iterator<SelectItem> iter = ((Collection<SelectItem>) value).iterator();
       while (iter.hasNext())
       {
-        items.add((SelectItem) iter.next());
+        items.add(iter.next());
       }
     }
     else if (value instanceof Map)
     {
-      Iterator entries = ((Map) value).entrySet().iterator();
-      while (entries.hasNext())
+      for(Map.Entry<Object, Object> entry : ((Map<Object, Object>) value).entrySet())
       {
-        Map.Entry entry = (Map.Entry) entries.next();
         Object label = entry.getKey();
         SelectItem item =
           new SelectItem(entry.getValue(),
@@ -322,11 +318,11 @@
    *                   itemValue is a String.
    */   
   static private void _addUIXSelectItem(
-    FacesContext  context,
-    UIComponent   component,
-    UIXSelectItem uixSelectItem,
-    List          items,
-    Converter     converter)
+    FacesContext     context,
+    UIComponent      component,
+    UIXSelectItem    uixSelectItem,
+    List<SelectItem> items,
+    Converter        converter)
   {  
     // check if rendered="false". If so, add null to the list.
     if (!uixSelectItem.isRendered())
@@ -372,7 +368,7 @@
     FacesContext fContext = FacesContext.getCurrentInstance();
   
     Converter converter = null;
-    Class modelClass = null;
+    Class<?> modelClass = null;
     
     ValueBinding binding = component.getValueBinding("value");
     if (binding != null)
@@ -393,7 +389,7 @@
     {
         // get the itemClass in the case where modelClass is an array or List
         // for instance, in the case of selectManyListbox
-        Class itemClass = modelClass.getComponentType();
+        Class<?> itemClass = modelClass.getComponentType();
         if (itemClass != null)
         {
            converter = ConverterUtils.createConverter(fContext, itemClass);           

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java Sun Aug  6 16:12:37 2006
@@ -45,6 +45,7 @@
    * @todo This throws a ConverterException on the first unconvertable
    *  value;  it should wait
    */
+  @Override
   public Object getConvertedValue(
     FacesContext context,
     UIComponent  component,
@@ -56,7 +57,7 @@
 
     UIXSelectMany selectMany = (UIXSelectMany)component;
 
-    Class modelClass = null;
+    Class<?> modelClass = null;
     ValueBinding binding = component.getValueBinding("value");
     if (binding != null)
     {
@@ -95,7 +96,7 @@
           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
@@ -106,7 +107,7 @@
       }
       else if (modelClass.isArray())
       {
-        Class itemClass = modelClass.getComponentType();
+        Class<?> itemClass = modelClass.getComponentType();
         if (converter == null)
         {
           converter = ConverterUtils.createConverter(context, itemClass);
@@ -149,8 +150,7 @@
     }
   }
 
-
-
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -182,10 +182,10 @@
     FacesContext context,
     UIComponent  component,
     Object       submittedValue,
-    Class        modelClass) throws ConverterException
+    Class<?>     modelClass) throws ConverterException
   {
     Converter converter = null;
-    Class itemClass = null;
+    Class<?> itemClass = null;
     // getComponentType returns the component type of an array, or null
     // if it isn't an array.
     if ( modelClass != null )
@@ -193,7 +193,7 @@
 
     if (itemClass != null)
       converter = ConverterUtils.createConverter(context, itemClass);
-    List selectItems = SelectItemSupport.getSelectItems(component, converter);
+    List<SelectItem> selectItems = SelectItemSupport.getSelectItems(component, converter);
 
     if ((selectItems == null) || (selectItems.isEmpty()))
     {
@@ -211,7 +211,7 @@
     assert (submittedValue instanceof String[]);
 
     String[] submittedValueArray = (String[])submittedValue;
-    List submittedValuesList = new ArrayList();
+    List<Object> submittedValuesList = new ArrayList<Object>();
 
 
     for (int i=0; i < submittedValueArray.length; i++)
@@ -222,7 +222,7 @@
 
         if (( -1 < index) && (selectItems.size() > index))
         {
-          SelectItem item = (SelectItem)selectItems.get(index);
+          SelectItem item = selectItems.get(index);
 
           if (item != null)
             submittedValuesList.add(item.getValue());

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyShuttleRenderer.java Sun Aug  6 16:12:37 2006
@@ -57,6 +57,7 @@
   static public final AttributeKey VALUE_ITEMS_ATTR =
     AttributeKey.getAttributeKey("valueItems");
 
+  @Override
   public void encodeBegin(FacesContext context, UIComponent component)
     throws IOException
   {
@@ -67,8 +68,8 @@
     // We store this in a map, with the key
     // being a SelectItem's value and the value is the index.
 
-    List selectItems = _getSelectItems(selectMany, context);
-    Map allItems = null;
+    List<SelectItem> selectItems = _getSelectItems(selectMany, context);
+    Map<Object, Integer> allItems = null;
 
     if (!isValuePassThru)
     {
@@ -77,7 +78,7 @@
        allItems = _getAllItems(selectItems);
     }
 
-    List valueItems;
+    List<SelectItem> valueItems;
 
     // The submitted values are in the form of a string array;
     // currently, we simply "toString()" the outgoing values,
@@ -115,7 +116,7 @@
     super.encodeBegin(context, component);
   }
 
-
+  @Override
   public void encodeEnd(FacesContext context, UIComponent component)
     throws IOException
   {
@@ -133,16 +134,17 @@
    * @todo Support ordinary UIXSelectItems?
    * @todo Support UISelectItems?
    */
-  private List _getSelectItems(
+  @SuppressWarnings("unchecked")
+  private List<SelectItem> _getSelectItems(
     UIXSelectMany many,FacesContext context)
   {
 
-    List childList = many.getChildren();
+    List<UIComponent> childList = many.getChildren();
     int childCount = childList.size();
-    List list = new ArrayList(childCount);
+    List<SelectItem> list = new ArrayList<SelectItem>(childCount);
     for (int i = 0; i < childCount; i++)
     {
-      UIComponent child = (UIComponent) childList.get(i);
+      UIComponent child = childList.get(i);
       if (child instanceof CoreSelectItem)
       {
         CoreSelectItem uiSelectItem = (CoreSelectItem) child;
@@ -192,12 +194,13 @@
     return list;
   }
 
-  private List _transferValueSelectItems(
-    List         selectItems,
-    Object       value,
-    boolean      toStringFirst)
+  @SuppressWarnings("unchecked")
+  private List<SelectItem> _transferValueSelectItems(
+    List<SelectItem> selectItems,
+    Object           value,
+    boolean          toStringFirst)
   {
-    List valueItemsList;
+    List<SelectItem> valueItemsList;
     if (value == null)
     {
       valueItemsList = Collections.EMPTY_LIST;
@@ -205,7 +208,7 @@
     else if (value.getClass().isArray())
     {
       int length = Array.getLength(value);
-      valueItemsList = new ArrayList(length);
+      valueItemsList = new ArrayList<SelectItem>(length);
       for (int i = 0; i < length; i++)
         _transferSelectItem(selectItems,
                             valueItemsList,
@@ -214,9 +217,9 @@
     }
     else if (value instanceof List)
     {
-      List valueList = (List) value;
+      List<Object> valueList = (List<Object>) value;
       int length = valueList.size();
-      valueItemsList = new ArrayList(length);
+      valueItemsList = new ArrayList<SelectItem>(length);
       for (int i = 0; i < length; i++)
         _transferSelectItem(selectItems,
                             valueItemsList,
@@ -225,7 +228,7 @@
     }
     else
     {
-      valueItemsList = new ArrayList(1);
+      valueItemsList = new ArrayList<SelectItem>(1);
       _transferSelectItem(selectItems, valueItemsList, value, toStringFirst);
     }
 
@@ -233,15 +236,15 @@
   }
 
   private void _transferSelectItem(
-    List from,
-    List to,
+    List<SelectItem> from,
+    List<SelectItem> to,
     Object value,
     boolean toStringFirst)
   {
     int length = from.size();
     for (int i = 0; i < length; i++)
     {
-      SelectItem selectItem = (SelectItem) from.get(i);
+      SelectItem selectItem = from.get(i);
       Object selectItemValue = selectItem.getValue();
       if (selectItemValue == null)
       {
@@ -275,6 +278,7 @@
                 " in list of available items.");
   }
 
+  @Override
   public Object getSubmittedValue(
     FacesContext context,
     UIComponent  component)
@@ -288,7 +292,7 @@
     if ((paramValue == null) || "".equals(paramValue))
       return new String[0];
 
-    List list = new ArrayList();
+    List<String> list = new ArrayList<String>();
     StringTokenizer tokenizer = new StringTokenizer(paramValue, ";");
 
     // don't let the submitted list get any bigger than the number of
@@ -307,7 +311,7 @@
         return new String[0];
       }
 
-      list.add(tokenizer.nextElement());
+      list.add(tokenizer.nextToken());
     }
 
     if (_LOG.isFiner())
@@ -319,13 +323,13 @@
 
   }
 
-  static private Map _getAllItems(List allSelectItems)
+  static private Map<Object, Integer> _getAllItems(List<SelectItem> allSelectItems)
   {
     int length = allSelectItems.size();
-    Map allItems = new ArrayMap(length);
+    Map<Object, Integer> allItems = new ArrayMap<Object, Integer>(length);
     for (int i=0; i < length; i++)
     {
-      SelectItem selectItem = (SelectItem) allSelectItems.get(i);
+      SelectItem selectItem = allSelectItems.get(i);
       Object selectItemValue = selectItem.getValue();
       allItems.put(selectItemValue, IntegerUtils.getInteger(i));
 
@@ -348,8 +352,8 @@
    *
    */
   static private void _convertSelectItemValueToIndex(
-    Map  allItems,
-    List itemsToConvert)
+    Map<Object, Integer> allItems,
+    List<SelectItem>     itemsToConvert)
   {
     if (allItems == null || itemsToConvert == null)
       return;
@@ -359,10 +363,10 @@
     // loop through each item to convert.
     for (int j=0; j < length; j++)
     {
-      SelectItem selectItem = (SelectItem) itemsToConvert.get(j);
+      SelectItem selectItem = itemsToConvert.get(j);
       Object selectItemValue = selectItem.getValue();
 
-      Integer index = (Integer)allItems.get(selectItemValue);
+      Integer index = allItems.get(selectItemValue);
       selectItem.setValue(index);
     }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SingleStepRenderer.java Sun Aug  6 16:12:37 2006
@@ -37,9 +37,13 @@
  */
 public class SingleStepRenderer extends UINodeRendererBase
 {
+  @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(UIConstants.EVENT_PARAM);
 
     if (UIConstants.GOTO_EVENT.equals(event))

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SubformRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SubformRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SubformRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SubformRenderer.java Sun Aug  6 16:12:37 2006
@@ -30,23 +30,27 @@
  */
 public class SubformRenderer extends Renderer
 {
-  static public List getSubformList(
+  @SuppressWarnings("unchecked")
+  static public List<String> getSubformList(
     FacesContext context,
     boolean      isDefault,
     boolean      createIfNeeded)
   {
     String key = isDefault ? _DEFAULT_LIST_KEY : _LIST_KEY;
-    Map requestMap = context.getExternalContext().getRequestMap();
-    List list = (List) requestMap.get(key);
+    Map<String, Object> requestMap = 
+      context.getExternalContext().getRequestMap();
+    
+    List<String> list = (List<String>) requestMap.get(key);
     if ((list == null) && createIfNeeded)
     {
-      list = new ArrayList();
+      list = new ArrayList<String>();
       requestMap.put(key, list);
     }
     
     return list;
   }
 
+  @Override
   public void encodeBegin(FacesContext context, UIComponent component)
   {
     boolean isDefault = ((UIXSubform) component).isDefault();
@@ -56,7 +60,7 @@
       getSubformList(context, true, true).add(clientId);
   }
 
-  
+  @Override
   public boolean getRendersChildren()
   {
     return false;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/TreeRenderer.java Sun Aug  6 16:12:37 2006
@@ -39,12 +39,16 @@
   /**
    * @todo do not mess with selection here. queue an event.
    */
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(
     FacesContext context, 
     UIComponent component)
   {
-    Map parameters = context.getExternalContext().getRequestParameterMap();
-    String source = (String) parameters.get(UIConstants.SOURCE_PARAM);
+    Map<String, String> parameters = 
+      context.getExternalContext().getRequestParameterMap();
+    
+    String source = parameters.get(UIConstants.SOURCE_PARAM);
 
     if (!component.getClientId(context).equals(source))
       return;
@@ -52,7 +56,7 @@
     TreeUtils.decodeExpandEvents(parameters, component, Collections.EMPTY_LIST);
     String currencyStrParam = 
       source + NamingContainer.SEPARATOR_CHAR + SELECTED_PARAM;
-    String currencyStr = (String) parameters.get(currencyStrParam);
+    String currencyStr = parameters.get(currencyStrParam);
     if ((currencyStr != null) && (!"".equals(currencyStr)))
     {
       UIXTree tree = (UIXTree) component;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreClassLoaderResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreClassLoaderResourceLoader.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreClassLoaderResourceLoader.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreClassLoaderResourceLoader.java Sun Aug  6 16:12:37 2006
@@ -36,6 +36,7 @@
     super("META-INF", parent);
   }
 
+  @Override
   protected URL findResource(
     String path) throws IOException
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/CoreCommonScriptsResourceLoader.java Sun Aug  6 16:12:37 2006
@@ -43,6 +43,7 @@
     setSeparator(_NEWLINE_SEPARATOR);
   }
 
+  @Override
   protected String getContentType(
     URLConnection conn)
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/AccessibilityMode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/AccessibilityMode.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/AccessibilityMode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/AccessibilityMode.java Sun Aug  6 16:12:37 2006
@@ -35,7 +35,7 @@
  */
 public final class AccessibilityMode
 {
-
+  @Override
   public String toString()
   {
     return _text;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java Sun Aug  6 16:12:37 2006
@@ -156,6 +156,7 @@
    *
    * @deprecated Use IMAGE_SERVLET_URL
    */
+  @Deprecated
   static public final Object TECATE_SERVLET_URL = IMAGE_SERVLET_URL;
 
   /**
@@ -245,5 +246,8 @@
   {
   }
 
+  // -= Simon Lessard =-
+  // FIXME: Never read locally
+  @SuppressWarnings("unused")
   private String _name;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ConfigurationImpl.java Sun Aug  6 16:12:37 2006
@@ -66,6 +66,7 @@
   /**
    * Returns whether the configuration is in debug mode.
    */
+  @Override
   public boolean isDebug()
   {
     return _debug;
@@ -99,6 +100,7 @@
    * @exception DirectoryUnavailableException if the directory is
    *    unavailable
    */
+  @Override
   public String getURI(Object key, String contextURI)
   {
     String uri = _getURI(key);
@@ -132,6 +134,7 @@
    * @exception DirectoryUnavailableException if the directory is
    *    unavailable
    */
+  @Override
   public String getPath(Object key, String contextPath)
   {
     String uri = _getURI(key);
@@ -158,6 +161,7 @@
    * @return the registered object, or null if no object
    *    was registered.
    */
+  @Override
   public Object getProperty(Object key)
   {
     return _properties.get(key);
@@ -263,11 +267,11 @@
   // Turn a key into a URI, deriving it if needed
   private String _getURI(Object key)
   {
-    String uri = (String) _resolvedURIs.get(key);
+    String uri = _resolvedURIs.get(key);
     if (uri != null)
       return uri;
 
-    uri = (String) _uris.get(key);
+    uri = _uris.get(key);
     if (uri == null)
     {
       if (BASE_DIRECTORY.equals(key))
@@ -310,7 +314,7 @@
 
   private String _getPath(Object key)
   {
-    String path = (String) _resolvedPaths.get(key);
+    String path = _resolvedPaths.get(key);
     if (path != null)
       return path;
 
@@ -365,11 +369,13 @@
   // full URI's MUST start with '/'.  This bogusness does
   // mean that we can't support registration of URIs to external
   // webservers.
-  private Hashtable _paths = new Hashtable(11);
-  private Hashtable _uris  = new Hashtable(11);
-  private Hashtable _resolvedURIs  = new Hashtable(11);
-  private Hashtable _resolvedPaths = new Hashtable(11);
-  private Hashtable _properties    = new Hashtable(11);
+  //-= Simon Lessard =-
+  //TODO: Check is synchronization is required
+  private Hashtable<Object, Object> _paths         = new Hashtable<Object, Object>(11);
+  private Hashtable<Object, String> _uris          = new Hashtable<Object, String>(11);
+  private Hashtable<Object, String> _resolvedURIs  = new Hashtable<Object, String>(11);
+  private Hashtable<Object, String> _resolvedPaths = new Hashtable<Object, String>(11);
+  private Hashtable<Object, Object> _properties    = new Hashtable<Object, Object>(11);
   private boolean   _debug;
 
   private static final String _DEFAULT_BASE_DIRECTORY   = "/adf/";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/RequestParameters.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/RequestParameters.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/RequestParameters.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/RequestParameters.java Sun Aug  6 16:12:37 2006
@@ -83,7 +83,7 @@
    *      request has no parameters
    *
    */
-  public abstract Iterator getParameterNames();
+  public abstract Iterator<String> getParameterNames();
 
   /**
    * Returns an array of <code>String</code> objects containing

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/data/ServletRequestParameters.java Sun Aug  6 16:12:37 2006
@@ -45,8 +45,8 @@
    * If not modification is required the returned Dicitonary instance
    * will be the <cpde>requestParams</code> instance.
    */
-  public static Map createRequestMap(
-    Map requestParams
+  public static Map<String, Object> createRequestMap(
+    Map<String, Object> requestParams
     )
   {
     if (requestParams == null)
@@ -63,7 +63,7 @@
    * a ServletRequest.
    */
   public ServletRequestParameters(
-    Map requestParams
+    Map<String, Object> requestParams
     )
   {
     _params = createRequestMap(requestParams);
@@ -81,9 +81,9 @@
    * adapted from org.apache.myfaces.trinidadinternal.uix22.servlet.url.DefaultPageEncoder
    */
   public static void decodeCompoundKeyValues(
-    String     compoundValue,
-    int        startIndex,
-    Map keyValues
+    String              compoundValue,
+    int                 startIndex,
+    Map<String, Object> keyValues
     )
   {
     if (compoundValue == null)
@@ -177,9 +177,9 @@
    * the baseName, if any;
    */
   public static String encodeCompoundKeyValues(
-    String      namePrefix,
-    Iterator     keyValues,
-    int         keyValueSize
+    String           namePrefix,
+    Iterator<Object> keyValues,
+    int              keyValueSize
     )
   {
 
@@ -192,12 +192,12 @@
    * the baseName, if any;
    */
   public static String encodeCompoundKeyValues(
-    String      namePrefix,
-    Iterator    keyValues,
-    int         keyValueSize,
-    String      exchangePrefix,
-    Iterator    keyExchanges,
-    int         keyExchangesSize
+    String           namePrefix,
+    Iterator<Object> keyValues,
+    int              keyValueSize,
+    String           exchangePrefix,
+    Iterator<Object> keyExchanges,
+    int              keyExchangesSize
     )
   {
 
@@ -247,8 +247,8 @@
    * the baseName, if any;
    */
   public static String encodeCompoundKeyValues(
-    Iterator keyValues,
-    int         keyValueSize
+    Iterator<Object> keyValues,
+    int              keyValueSize
     )
   {
     return encodeCompoundKeyValues(_COMPOUND_NAME_PREFIX, keyValues, keyValueSize);
@@ -259,10 +259,10 @@
    * the baseName, if any.
    */
   public static String encodeCompoundKeyValues(
-    Iterator    keyValues,
-    int         keyValueSize,
-    Iterator    keyExchanges,
-    int         keyExchangesSize
+    Iterator<Object> keyValues,
+    int              keyValueSize,
+    Iterator<Object> keyExchanges,
+    int              keyExchangesSize
     )
   {
     return encodeCompoundKeyValues(_COMPOUND_NAME_PREFIX,
@@ -296,6 +296,7 @@
    * @see     #getParameterValues
    *
    */
+  @Override
   public String getParameter(
     String name
     )
@@ -327,7 +328,8 @@
    *      request has no parameters
    *
    */
-  public Iterator getParameterNames()
+  @Override
+  public Iterator<String> getParameterNames()
   {
     return _params.keySet().iterator();
   }
@@ -349,6 +351,7 @@
    * @see    #getParameter
    *
    */
+  @Override
   public String[] getParameterValues(
     String name
     )
@@ -362,7 +365,7 @@
 
       if (_cloneArrays)
       {
-        return (String[])paramArr.clone();
+        return paramArr.clone();
       }
       else
       {
@@ -376,8 +379,8 @@
   }
 
 
-  private static Map _processParameters(
-    Map requestParams,
+  private static Map<String, Object> _processParameters(
+    Map<String, Object> requestParams,
     int        dictionarySize
     )
   {
@@ -386,16 +389,18 @@
 
     if (hasCompoundName)
     {
-      Hashtable params = new Hashtable((int)(dictionarySize * 1.5));
-      HashMap keyExchangeMap = new HashMap();
+      Hashtable<String, Object> params = 
+        new Hashtable<String, Object>((int)(dictionarySize * 1.5));
+      
+      HashMap<String, String> keyExchangeMap = new HashMap<String, String>();
 
-      Iterator paramNames = requestParams.keySet().iterator();
+      Iterator<String> paramNames = requestParams.keySet().iterator();
 
       if (paramNames != null)
       {
         while (paramNames.hasNext())
         {
-          String currName = (String)paramNames.next();
+          String currName = paramNames.next();
 
           boolean putValue = true;
 
@@ -444,11 +449,11 @@
                   {
                     toIndex = currName.indexOf('=', fromIndex);
                     // get the old param name
-                    Object oldKey = currName.substring(fromIndex, toIndex);
+                    String oldKey = currName.substring(fromIndex, toIndex);
                     fromIndex = toIndex + 1;
                     toIndex = currName.indexOf(_PROPERTY_BOUNDARY, fromIndex);
                     // get the new param name
-                    Object newKey = currName.substring(fromIndex, toIndex);
+                    String newKey = currName.substring(fromIndex, toIndex);
                     fromIndex = toIndex + 1;
                     // add old and new keys to map
                     keyExchangeMap.put(oldKey, newKey);
@@ -482,16 +487,16 @@
       }
 
       // Exchange param names if needed
-      Iterator oldKeys = keyExchangeMap.keySet().iterator();
+      Iterator<String> oldKeys = keyExchangeMap.keySet().iterator();
       while (oldKeys.hasNext())
       {
-        Object oldKey = oldKeys.next();
+        String oldKey = oldKeys.next();
         Object value = params.get(oldKey);
 
         if ( value != null )
         {
           // Currently not removing old key/value pair
-          Object newKey = keyExchangeMap.get(oldKey);
+          String newKey = keyExchangeMap.get(oldKey);
           params.put(newKey, value);
         }
       }
@@ -505,9 +510,9 @@
   }
 
   private static void _encodeIterator(
-    Iterator  keyValues,
-    StringBuffer compoundValue,
-    String       prefix
+    Iterator<Object>  keyValues,
+    StringBuffer      compoundValue,
+    String            prefix
     )
   {
 
@@ -700,7 +705,7 @@
                                                 _COMPOUND_NAME_PREFIX.length();
 
   // Dictioanry of parameter keys and values
-  private Map _params;
+  private Map<String, Object> _params;
 
   // whether the String arrays returned need to be cloned
   private boolean _cloneArrays;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java Sun Aug  6 16:12:37 2006
@@ -53,7 +53,7 @@
    */
   public static Object coerce(ExpressionContext context,
                               String text,
-                              Class type) throws IllegalArgumentException
+                              Class<?> type) throws IllegalArgumentException
   {
     if (type != null)
     {
@@ -188,7 +188,8 @@
   /**
    * coerces an instance into an instance of the given type
    */
-  public static Object coerce(Object value, Class type)
+  @SuppressWarnings("unchecked")
+  public static Object coerce(Object value, Class<?> type)
   {
     if (type != null)
     {
@@ -246,14 +247,14 @@
         // 2. coerce a single value into an array of size 1.
         // 3. coerce an array into an array.
 
-        Class arrayType = type.getComponentType();
+        Class<?> arrayType = type.getComponentType();
         Object res = Array.newInstance(arrayType, 1);
 
         if (value instanceof List)
         {
           // we probably should coerce each element of this list; however,
           // let's not worry about it until we have a requirement:
-          res = ((List) value).toArray((Object[]) res);
+          res = ((List<Object>) value).toArray((Object[]) res);
         }
         else if (value.getClass().isArray())
         {
@@ -537,6 +538,7 @@
       _toString = toString;
     }
 
+    @Override
     public String toString()
     {
       return _toString;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/ExpressionParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/ExpressionParser.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/ExpressionParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/ExpressionParser.java Sun Aug  6 16:12:37 2006
@@ -36,7 +36,7 @@
   public abstract Object parseExpression(
     ExpressionContext context,
     String         text,
-    Class          type) throws ExplException;
+    Class<?>       type) throws ExplException;
 
   /**
    * @param context   the binding context

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Function.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Function.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Function.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Function.java Sun Aug  6 16:12:37 2006
@@ -31,7 +31,7 @@
 
   public abstract Class[] getParameterTypes();
 
-  public abstract Class getReturnType();
+  public abstract Class<?> getReturnType();
 
   // package private constructor:
   Function()

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/JavaMethod.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/JavaMethod.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/JavaMethod.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/JavaMethod.java Sun Aug  6 16:12:37 2006
@@ -32,6 +32,7 @@
     _met = method;
   }
 
+  @Override
   public Object invoke(Object instance, Object[] args)
     throws IllegalAccessException, IllegalArgumentException,
            InvocationTargetException
@@ -39,12 +40,14 @@
     return _met.invoke(instance, args);
   }
 
+  @Override
   public Class[] getParameterTypes()
   {
     return _met.getParameterTypes();
   }
 
-  public Class getReturnType()
+  @Override
+  public Class<?> getReturnType()
   {
     return _met.getReturnType();
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingInputStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingInputStreamProvider.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingInputStreamProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingInputStreamProvider.java Sun Aug  6 16:12:37 2006
@@ -40,5 +40,5 @@
    * only valid after the target has been processed.  If there
    * are no dependencies, returns null.
    */
-  public Iterator getCacheDependencies();
+  public Iterator<InputStreamProvider> getCacheDependencies();
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/CachingNameResolver.java Sun Aug  6 16:12:37 2006
@@ -45,7 +45,7 @@
    */
   public CachingNameResolver(
     NameResolver base,
-    Map   storage,
+    Map<Object, InputStreamProvider> storage,
     boolean      checkModified)
   {
     this(base,
@@ -67,7 +67,7 @@
    */
   public CachingNameResolver(
     NameResolver base,
-    Map   storage,
+    Map<Object, InputStreamProvider> storage,
     int          msBetweenChecks)
   {
     if (base == null)
@@ -75,7 +75,7 @@
 
     _base = base;
     if (storage == null)
-      storage = new Hashtable(197);
+      storage = new Hashtable<Object, InputStreamProvider>(197);
 
     _cachedFiles = storage;
 
@@ -118,6 +118,7 @@
                                    _msBetweenChecks);
   }
 
+  @Override
   public String toString()
   {
     return super.toString() + "[" + _base.toString() + "]";
@@ -133,7 +134,7 @@
     // We don't require the storage to be synchronized
     synchronized (_cachedFiles)
     {
-      CachingProvider provider = (CachingProvider) _cachedFiles.get(o);
+      InputStreamProvider provider = _cachedFiles.get(o);
       if ((provider != null) && _checkModified())
       {
         if (provider.hasSourceChanged())
@@ -147,7 +148,9 @@
     }
   }
 
-  static void __addToCache(CachingProvider provider, Map storage)
+  static void __addToCache(
+      CachingProvider provider, 
+      Map<Object, InputStreamProvider> storage)
   {
     // We don't require the storage to be synchronized
     synchronized (storage)
@@ -164,7 +167,7 @@
                                        implements CachingInputStreamProvider
   {
     public CachingProvider(InputStreamProvider wrapped,
-                           Map storage,
+                           Map<Object, InputStreamProvider> storage,
                            int msBetweenChecks)
     {
       _wrapped = wrapped;
@@ -172,6 +175,7 @@
       _msBetweenChecks = msBetweenChecks;
     }
 
+    @Override
     public void setCachedResult(Object value)
     {
       _lastChecked  = System.currentTimeMillis();
@@ -182,6 +186,7 @@
 
     // Check not just whether we've changed, but whether any
     // of our dependencies have.
+    @Override
     public boolean hasSourceChanged()
     {
       // Don't check unless at least _msBetweenChecks has passed
@@ -198,12 +203,12 @@
       if (changed)
         return true;
 
-      ArrayList dependencies = _dependencies;
+      ArrayList<InputStreamProvider> dependencies = _dependencies;
       if (dependencies != null)
       {
         for (int i = dependencies.size() - 1; i >= 0; i--)
         {
-          if (((InputStreamProvider) dependencies.get(i)).hasSourceChanged())
+          if (dependencies.get(i).hasSourceChanged())
           {
             return true;
           }
@@ -227,33 +232,34 @@
         return;
 
       if (_dependencies == null)
-        _dependencies = new ArrayList(5);
+        _dependencies = new ArrayList<InputStreamProvider>(5);
       _dependencies.add(dependency);
     }
 
-    public Iterator getCacheDependencies()
+    public Iterator<InputStreamProvider> getCacheDependencies()
     {
-      ArrayList dependencies = _dependencies;
+      ArrayList<InputStreamProvider> dependencies = _dependencies;
       if (dependencies == null)
         return null;
 
       return dependencies.iterator();
     }
 
+    @Override
     protected InputStreamProvider getProvider()
     {
       return _wrapped;
     }
 
-    private ArrayList  _dependencies;
-    private Map _storage;
+    private ArrayList<InputStreamProvider>  _dependencies;
+    private Map<Object, InputStreamProvider> _storage;
     private final InputStreamProvider _wrapped;
     private long       _lastChecked  = -1;
     private int       _msBetweenChecks;
   }
 
   private NameResolver   _base;
-  private Map     _cachedFiles;
+  private Map<Object, InputStreamProvider> _cachedFiles;
 
   // this param is set to _DO_NOT_CHECK_MODIFIED to indicate not to check at all
   private int            _msBetweenChecks;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ClassResourceNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ClassResourceNameResolver.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ClassResourceNameResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ClassResourceNameResolver.java Sun Aug  6 16:12:37 2006
@@ -31,18 +31,20 @@
  */
 public class ClassResourceNameResolver extends DefaultNameResolver
 {
-  public ClassResourceNameResolver(Class base)
+  public ClassResourceNameResolver(Class<?> base)
   {
     super(null, null);
 
     _base = base;
   }
 
+  @Override
   protected File getFile(String name)
   {
     return null;
   }
 
+  @Override
   protected URL getURL(String name)
   {
     if (_base == null)
@@ -51,5 +53,5 @@
     return _base.getResource(name);
   }
 
-  private final Class _base;
+  private final Class<?> _base;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/DefaultNameResolver.java Sun Aug  6 16:12:37 2006
@@ -152,8 +152,7 @@
     return resolver;
   }
 
-
-
+  @Override
   public String toString()
   {
     String val = super.toString() + "[";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/InputStreamProviderProxy.java Sun Aug  6 16:12:37 2006
@@ -60,6 +60,7 @@
     return getProvider().hasSourceChanged();
   }
 
+  @Override
   public boolean equals(Object o)
   {
     if (o instanceof InputStreamProviderProxy)
@@ -68,6 +69,7 @@
     return getProvider().equals(o);
   }
 
+  @Override
   public int hashCode()
   {
     return getProvider().hashCode();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/ServletNameResolver.java Sun Aug  6 16:12:37 2006
@@ -44,6 +44,7 @@
     _context = context;
   }
 
+  @Override
   protected File getFile(String name)
   {
     String rootName;
@@ -61,6 +62,8 @@
     if ((_request != null) && (file == null))
     {
       // Try a second way to make JServ happy
+      // -= Simon Lessard =-
+      // FIXME: That call is deprecated, is it really needed?
       file = _getFile(_request.getRealPath(rootName));
     }
 
@@ -70,6 +73,7 @@
     return super.getFile(name);
   }
 
+  @Override
   protected URL getURL(String name)
   {
     if (_context == null)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/io/URLInputStreamProvider.java Sun Aug  6 16:12:37 2006
@@ -50,7 +50,7 @@
     InputStream base = connection.getInputStream();
     
     if (base instanceof BufferedInputStream)
-      return (BufferedInputStream) base;
+      return base;
     else
       return new BufferedInputStream(base);
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DateFormatContext.java Sun Aug  6 16:12:37 2006
@@ -32,6 +32,7 @@
   /**
    * Override of Object.hashCode().
    */
+  @Override
   public int hashCode()
   {
     int twoDigitYearStart = getTwoDigitYearStart();
@@ -42,6 +43,7 @@
   /**
    * Override of Object.equals().
    */
+  @Override
   public boolean equals(Object obj)
   {
     if (obj == this)
@@ -58,6 +60,7 @@
     return (thisTwoDigitYearStart == thatTwoDigitYearStart);
   }
 
+  @Override
   public Object clone()
   {
     try
@@ -74,6 +77,7 @@
   /**
    * Override of Object.toString().
    */
+  @Override
   public String toString()
   {
     StringBuffer buffer = new StringBuffer(super.toString());

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/DecimalFormatContext.java Sun Aug  6 16:12:37 2006
@@ -41,6 +41,7 @@
   /**
    * Override of Object.hashCode().
    */
+  @Override
   public int hashCode()
   {
     char grouping = getGroupingSeparator();
@@ -52,6 +53,7 @@
   /**
    * Override of Object.equals().
    */
+  @Override
   public boolean equals(Object obj)
   {
     if (obj == this)
@@ -72,6 +74,7 @@
     return (thisDecimal == thatDecimal);
   }
 
+  @Override
   public Object clone()
   {
     try
@@ -88,6 +91,7 @@
   /**
    * Override of Object.toString().
    */
+  @Override
   public String toString()
   {
     StringBuffer buffer = new StringBuffer(super.toString());

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDateFormatContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDateFormatContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDateFormatContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDateFormatContext.java Sun Aug  6 16:12:37 2006
@@ -35,16 +35,19 @@
     _dfc = (DateFormatContext) dfc.clone();
   }
 
+  @Override
   public int getTwoDigitYearStart()
   {
     return _dfc.getTwoDigitYearStart();
   }
 
+  @Override
   public boolean equals(Object obj)
   {
     return super.equals(obj);
   }
 
+  @Override
   public int hashCode()
   {
     return _hashCode;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDecimalFormatContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDecimalFormatContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDecimalFormatContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/ImmutableDecimalFormatContext.java Sun Aug  6 16:12:37 2006
@@ -39,6 +39,7 @@
   /**
    * Returns the character used to separate number groupings.
    */
+  @Override
   public char getGroupingSeparator()
   {
     return _dfc.getGroupingSeparator();
@@ -47,16 +48,19 @@
   /**
    * Returns the character used as a decimal separator.
    */
+  @Override
   public char getDecimalSeparator()
   {
     return _dfc.getDecimalSeparator();
   }
 
+  @Override
   public boolean equals(Object obj)
   {
     return super.equals(obj);
   }
 
+  @Override
   public int hashCode()
   {
     return _hashCode;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java Sun Aug  6 16:12:37 2006
@@ -38,6 +38,8 @@
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/share/nls/LocaleContext.java#0 $) $Date: 10-nov-2005.19:00:03 $
  * @author The Oracle ADF Faces Team
  */
+// -= Simon Lessard =-
+// FIXME: Deprecation within this class is strange...
 public class LocaleContext
 {
   /**
@@ -180,6 +182,7 @@
    * @deprecated  use MutableLocaleContext.setReadingDirection() instead
    * @see org.apache.myfaces.trinidadinternal.share.nls.MutableLocaleContext
    */
+  @Deprecated
   public void setReadingDirection(
     int newReadingDirection
     )
@@ -212,6 +215,7 @@
    * @deprecated  use MutableLocaleContext.setTimeZone() instead
    * @see org.apache.myfaces.trinidadinternal.share.nls.MutableLocaleContext
    */
+  @Deprecated
   public void setTimeZone(
     TimeZone newTimeZone
     )
@@ -228,6 +232,7 @@
   /**
    * Override of Object.toString().
    */
+  @Override
   public String toString()
   {
     StringBuffer buffer = new StringBuffer(super.toString());
@@ -263,10 +268,10 @@
   {
     if (_bundles == null)
     {
-      _bundles = new Hashtable(13);
+      _bundles = new Hashtable<String, ResourceBundle>(13);
     }
 
-    ResourceBundle bundle = (ResourceBundle)_bundles.get(baseBundleName);
+    ResourceBundle bundle = _bundles.get(baseBundleName);
 
     if (bundle == null)
     {
@@ -326,6 +331,7 @@
   /**
    * Override of Object.hashCode().
    */
+  @Override
   public int hashCode()
   {
     return getLocale().hashCode();
@@ -334,6 +340,7 @@
   /**
    * Override of Object.equals().
    */
+  @Override
   public boolean equals(Object obj)
   {
     if (obj == this)
@@ -378,11 +385,13 @@
 
   static private class DefaultDecimal extends DecimalFormatContext
   {
+    @Override
     public char getGroupingSeparator()
     {
       return (char) 0;
     }
 
+    @Override
     public char getDecimalSeparator()
     {
       return (char) 0;
@@ -391,6 +400,7 @@
 
   static private class DefaultDate extends DateFormatContext
   {
+    @Override
     public int getTwoDigitYearStart()
     {
       return 1950;
@@ -402,7 +412,9 @@
   private static final DecimalFormatContext _sDefaultDecimalFormatContext =
                                                 new DefaultDecimal();
 
-  private Hashtable _bundles;
+  // -= Simon Lessard =-
+  // FIXME: Check if synchronization is really required
+  private Hashtable<String, ResourceBundle> _bundles;
 
   private Locale   _locale;
   private Locale   _transLocale;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableDecimalFormatContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableDecimalFormatContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableDecimalFormatContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableDecimalFormatContext.java Sun Aug  6 16:12:37 2006
@@ -34,6 +34,7 @@
   /**
    * Returns the character used to separate number groupings.
    */
+  @Override
   public char getGroupingSeparator()
   {
     return _groupingSeparator;
@@ -52,6 +53,7 @@
   /**
    * Returns the character used as a decimal separator.
    */
+  @Override
   public char getDecimalSeparator()
   {
     return _decimalSeparator;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java Sun Aug  6 16:12:37 2006
@@ -35,6 +35,8 @@
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/share/nls/MutableLocaleContext.java#0 $) $Date: 10-nov-2005.19:00:05 $
  * @author The Oracle ADF Faces Team
  */
+// -= Simon Lessard =-
+// FIXME: Deprecation within this class is strange...
 public final class MutableLocaleContext extends LocaleContext
 {
   /**
@@ -99,6 +101,7 @@
    * @see #getReadingDirection
    * @see org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils
    */
+  @Override
   public void setReadingDirection(
     int newReadingDirection
     )
@@ -110,6 +113,7 @@
    * Sets the TimeZone that the user is running in.  Setting this value
    * to null will set the TimeZone to the default TimeZone.
    */
+  @Override
   public void setTimeZone(
     TimeZone newTimeZone
     )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/ColorFormat.java Sun Aug  6 16:12:37 2006
@@ -54,6 +54,7 @@
    *
    * @exception ParseException if the specified string is invalid.
    */
+  @Override
   public Object parseObject(
     String source) throws ParseException 
   {
@@ -72,6 +73,7 @@
   /**
    * Returns the value as a Color.
    */
+  @Override
   abstract public Object parseObject(
     String        source, 
     ParsePosition status);
@@ -89,6 +91,7 @@
     return format(color, new StringBuffer(),new FieldPosition(0)).toString();
   }
 
+  @Override
   public final StringBuffer format(
     Object obj, 
     StringBuffer toAppendTo,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/text/RGBColorFormat.java Sun Aug  6 16:12:37 2006
@@ -78,6 +78,7 @@
   /**
    * Returns the value as a Color.
    */
+  @Override
   public Object parseObject(
     String        text, 
     ParsePosition pos)
@@ -255,6 +256,7 @@
                      rgba[_ALPHA_FIELD]);
   }
 
+  @Override
   public StringBuffer format(
     Color color,
     StringBuffer toAppendTo,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/EncoderUtils.java Sun Aug  6 16:12:37 2006
@@ -347,7 +347,7 @@
           else if ((ch & 0xFC00) == 0xD800)
           {
             // Clear high 6 bits.
-            int highSurrogate = ((int) ch) & 0x03FF;
+            int highSurrogate = ch & 0x03FF;
 
             // Middle 4 bits (wwww) + 1
             // "Note that the value of wwww from the high surrogate bit
@@ -372,7 +372,7 @@
 
 
             // Clear high 6 bits.
-            int lowSurrogate = ((int) ch) & 0x03FF;
+            int lowSurrogate = ch & 0x03FF;
 
             // put the middle 4 bits into the bottom of yyyyyy (byte 3)
             yyyyyy = yyyyyy | ((lowSurrogate & 0x03C0) >> 6);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/NullFormEncoder.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/NullFormEncoder.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/NullFormEncoder.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/url/NullFormEncoder.java Sun Aug  6 16:12:37 2006
@@ -27,6 +27,7 @@
   /**
    * Indicate that the form is now being encoded.
    */
+  @Override
   public void startForm(
     Object formName)
   {
@@ -36,6 +37,7 @@
   /**
    * Indicate that the form is finished.
    */
+  @Override
   public void endForm()
   {
     // nop
@@ -44,6 +46,7 @@
   /**
    * Encode a form value.
    */
+  @Override
   public Object encodeFormValue(
     Object inputName,
     Object inputValue)
@@ -55,6 +58,7 @@
   /**
    * Encode a client parameter.
    */
+  @Override
   public Object encodeClientParameter(
     Object formName,
     Object inputName,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/CaboHttpUtils.java Sun Aug  6 16:12:37 2006
@@ -74,6 +74,8 @@
     // As documented, this function doesn't convert "properly"
     // from characters to bytes.  But it happens to do
     // exactly the conversion we want
+    // -= Simon Lessard =- 
+    // TODO: Wouldn't getBytes() do the trick?
     string.getBytes(0, stringLength, buffer, 0);
 
     return new String(buffer, 0, stringLength, encoding);
@@ -90,8 +92,8 @@
     String string
     )
   {
-    ArrayList values = new ArrayList();
-    ArrayList qValues = new ArrayList();
+    ArrayList<String> values = new ArrayList<String>();
+    ArrayList<Float> qValues = new ArrayList<Float>();
     if (string != null)
     {
       StringTokenizer tokens = new StringTokenizer(string, ",");
@@ -141,7 +143,7 @@
         int i = values.size() - 1;
         while (i >= 0)
         {
-          float f = ((Float) qValues.get(i)).floatValue();
+          float f = qValues.get(i).floatValue();
           if (f >= currQ)
             break;
 
@@ -153,7 +155,7 @@
       }
     }
 
-    return (String[]) values.toArray(new String[values.size()]);
+    return values.toArray(new String[values.size()]);
   }
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/MultipartFormHandler.java Sun Aug  6 16:12:37 2006
@@ -358,9 +358,13 @@
           assert false;
         }
       }
-
       else
+      {
+        // -= Simon Lessard =- 
+        // TODO:  Check if a non deprecated constructor
+        //                           would do the trick
         return new String(data, 0, start, bytes);
+      }
     }
 
     return "";
@@ -551,7 +555,7 @@
                 }
               }
 
-              totalBytesWritten += (long) bufferedBytes;
+              totalBytesWritten += bufferedBytes;
               if (totalBytesWritten <= _maxAllowedBytes)
                 out.write(buffer, 0, bufferedBytes);
               position += bufferedBytes;
@@ -582,7 +586,7 @@
              bufferedBytes -= 2;
         }
 
-        totalBytesWritten += (long) bufferedBytes;
+        totalBytesWritten += bufferedBytes;
         if (totalBytesWritten <= _maxAllowedBytes)
           out.write(buffer, 0, bufferedBytes);
         position += bufferedBytes;
@@ -780,6 +784,7 @@
         return _finished;
       }
 
+      @Override
       public int read(byte[] buffer, int offset, int length)
         throws IOException
       {
@@ -820,12 +825,14 @@
         return bytes;
       }
 
+      @Override
       public int read(byte[] buffer)
         throws IOException
       {
         return read(buffer, 0, buffer.length);
       }
 
+      @Override
       public int read()
         throws IOException
       {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/NamespaceMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/NamespaceMap.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/NamespaceMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/util/NamespaceMap.java Sun Aug  6 16:12:37 2006
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.NoSuchElementException;
 
 import org.apache.myfaces.trinidad.util.ArrayMap;
@@ -70,9 +71,12 @@
    * @return null if such a namespace/key does not exist. else returns the
    *  associated value.
    */
+  @SuppressWarnings("unchecked")
   public Object get(String namespace, Object key)
   {
-    HashMap map = (HashMap) ArrayMap.get(_namespaces, namespace);
+    Map<Object, Object> map = 
+      (Map<Object, Object>) ArrayMap.get(_namespaces, namespace);
+    
     if (map!=null)
       return map.get(key);
 
@@ -85,9 +89,12 @@
    * @param key the key to search the namespace for.
    * @return the associated value, or null if the namespace/key does not exist.
    */
+  @SuppressWarnings("unchecked")
   public Object remove(String namespace, Object key)
   {
-    HashMap map = (HashMap) ArrayMap.get(_namespaces, namespace);
+    Map<Object, Object> map = 
+      (Map<Object, Object>) ArrayMap.get(_namespaces, namespace);
+    
     if (map!=null)
     {
       Object o = map.remove(key);
@@ -119,18 +126,27 @@
   /**
    * Returns an Iterator over all the namespaces added to the map.
    */
-  public Iterator getNamespaceIterator()
+  @SuppressWarnings("unchecked")
+  public Iterator<Map<Object, Object>> getNamespaceIterator()
   {
     Object[] namespaces = _namespaces;
     if (namespaces == null)
       return null;
     int i = namespaces.length - 2;
-    ArrayList namespacesList = new ArrayList();
+    
+    ArrayList<Map<Object, Object>> namespacesList = 
+      new ArrayList<Map<Object, Object>>();
+    
+    // -= Simon Lessard =-
+    // FIXME: Extremely strong coupling to with ArrayMap's internal structure.
+    //        This is some bad design, this map should instead extends ArrayMap
+    //        or use one as its internal state rather than Object[].
     while(i>=0)
     {
-      namespacesList.add(namespaces[i]);
+      namespacesList.add((Map<Object, Object>)namespaces[i]);
       i=i-2;
     }
+    
     return namespacesList.iterator();
   }
 
@@ -138,7 +154,7 @@
   /**
    * Returns an Enumeration over all the values added to the map.
    */
-  public Iterator getValueIterator()
+  public Iterator<Object> getValueIterator()
   {
     return new Enum();
   }
@@ -146,9 +162,12 @@
   /**
    * Returns an Iterator over all of the values for a particular namespace.
    */
-  public Iterator getValueIterator(String namespace)
+  @SuppressWarnings("unchecked")
+  public Iterator<Object> getValueIterator(String namespace)
   {
-    HashMap map = (HashMap)ArrayMap.get(_namespaces, namespace);
+    Map<Object, Object> map = 
+      (Map<Object, Object>)ArrayMap.get(_namespaces, namespace);
+    
     if (map == null)
       return null;
 
@@ -158,9 +177,12 @@
   /**
    * Returns an Iterator over all of the keys for a particular namespace.
    */
-  public Iterator getKeysIterator(String namespace)
+  @SuppressWarnings("unchecked")
+  public Iterator<Object> getKeysIterator(String namespace)
   {
-    HashMap map = (HashMap)ArrayMap.get(_namespaces, namespace);
+    Map<Object, Object> map = 
+      (Map<Object, Object>)ArrayMap.get(_namespaces, namespace);
+    
     if (map == null)
       return null;
 
@@ -171,6 +193,8 @@
   /**
    * Returns a clone of the NamespaceMap
    */
+  @SuppressWarnings("unchecked")
+  @Override
   public Object clone()
   {
     NamespaceMap namespaceMap;
@@ -193,11 +217,13 @@
       int length = _namespaces.length;
       Object[] namespaces = new Object[length];
       System.arraycopy(_namespaces, 0, namespaces, 0, length);
+      // -= Simon Lessard =-
+      // FIXME: Strong ArrayMap's internal functionality coupling here as well
       for (int i = 1; i < length; i += 2)
       {
-        HashMap hm = (HashMap) namespaces[i];
+        HashMap<Object, Object> hm = (HashMap<Object, Object>) namespaces[i];
         if (hm != null)
-          namespaces[i] = (HashMap) hm.clone();
+          namespaces[i] = hm.clone();
       }
 
       namespaceMap._namespaces = namespaces;
@@ -206,6 +232,7 @@
     return namespaceMap;
   }
 
+  @SuppressWarnings("unchecked")
   //
   // =-=AEW Package-private version, needed by BindableNamespaceMap
   // since it returns the old value.  It'd be nice to change the
@@ -224,10 +251,12 @@
     }
     else
     {
-      HashMap map = (HashMap) ArrayMap.get(_namespaces, namespace);
+      Map<Object, Object> map = 
+        (Map<Object, Object>) ArrayMap.get(_namespaces, namespace);
+      
       if (map==null)
       {
-        map = new HashMap(_defaultSize);
+        map = new HashMap<Object, Object>(_defaultSize);
         _namespaces = ArrayMap.put(_namespaces, namespace, map);
       }
 
@@ -250,7 +279,7 @@
   //
   // Internal enumeration class
   //
-  private class Enum implements Iterator
+  private class Enum implements Iterator<Object>
   {
     public Enum()
     {
@@ -290,16 +319,17 @@
     }
 
     // Advance to the next iterator (actually, we go backwards)
+    @SuppressWarnings("unchecked")
     private void _advanceIterator()
     {
       int index = _index - 2;
       _index = index;
       if (index > 0)
-        _iterator = ((HashMap) _namespaces[index]).values().iterator();
+        _iterator = ((Map<Object, Object>)_namespaces[index]).values().iterator();
     }
 
     // Current iterator
-    private Iterator _iterator;
+    private Iterator<Object> _iterator;
 
     // Index into the _namespaces array
     private int      _index;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/ClassParserFactory.java Sun Aug  6 16:12:37 2006
@@ -35,7 +35,7 @@
    * @param classObject a Class instance that must be a subclass of
    *   NodeParser
    */
-  public ClassParserFactory(Class classObject)
+  public ClassParserFactory(Class<?> classObject)
   {
     if (classObject == null)
       throw new NullPointerException();
@@ -99,6 +99,6 @@
     assert (NodeParser.class.isAssignableFrom(_class));
   }
 
-  private Class _class;
+  private Class<?> _class;
   private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ClassParserFactory.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/LeafNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/LeafNodeParser.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/LeafNodeParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/LeafNodeParser.java Sun Aug  6 16:12:37 2006
@@ -38,6 +38,7 @@
   /**
    * Implementation of NodeParser.startElement()
    */
+  @Override
   public void startElement(
     ParseContext context,
     String       namespaceURI,
@@ -54,6 +55,7 @@
   /**
    * Implementation of NodeParser.endElement()
    */
+  @Override
   public Object endElement(
     ParseContext context,
     String       namespaceURI,
@@ -63,6 +65,7 @@
     return _value;
   }
 
+  @Override
   public NodeParser startChildElement(
     ParseContext context,
     String       namespaceURI,



Mime
View raw message