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 [6/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/desktop/DesktopTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java Sun Aug  6 16:12:37 2006
@@ -64,6 +64,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -81,6 +82,7 @@
     this(CoreTable.TYPE);
   }
 
+  @Override
   protected final void renderSingleRow(
     FacesContext context,
     RenderingContext arc,
@@ -226,6 +228,7 @@
       writer.writeText(LINKS_DIVIDER_TEXT, null);
   }
 
+  @Override
   protected void renderSubControlBar(
     FacesContext context,
     RenderingContext arc,
@@ -241,6 +244,7 @@
     renderSelectionLinks(context, arc, tContext, component);
   }
 
+  @Override
   protected void renderTableContent(
     FacesContext context,
     RenderingContext arc,
@@ -504,6 +508,7 @@
 
 
   // render the control bar
+  @Override
   protected final void renderControlBar(
     FacesContext          context,
     RenderingContext   arc,
@@ -626,6 +631,7 @@
    * renders attributes on the outermost table element.
    * this includes width, cellpadding, cellspacing, border.
    */
+  @Override
   protected void renderTableAttributes(
     FacesContext        context,
     RenderingContext arc,
@@ -815,6 +821,7 @@
     final UIComponent detail = tContext.getDetail();
     final RenderStage renderStage = tContext.getRenderStage();
     TableUtils.RowLoop loop = new TableUtils.RowLoop() {
+      @Override
       protected void processRowImpl(FacesContext fc, CollectionComponent tableBase)
         throws IOException
       {
@@ -939,6 +946,7 @@
     }
   }
 
+  @SuppressWarnings("unchecked")
   private void _renderRegularColumns(
     FacesContext          context,
     TableRenderingContext tContext,
@@ -948,7 +956,7 @@
     // this renders a whole bunch of <TH>...</TH> elements.
     // part of #1313720, base column header count on
     // table child count
-    List children = component.getChildren();
+    List<UIComponent> children = component.getChildren();
     int colCount  = children.size();
     int[] hidden = tContext.getHiddenColumns();
     ColumnData colData = tContext.getColumnData();
@@ -975,6 +983,7 @@
   /**
    * @todo Re-fix bug 3211593 (see below)
    */
+  @SuppressWarnings("unchecked")
   protected final void renderFooter(
     FacesContext          context,
     RenderingContext   arc,
@@ -1017,14 +1026,12 @@
         colData.setColumnIndex(tContext.getSpecialColumnCount(),
                                0/*logicalColumnIndex*/);
 
-        List children = component.getChildren();
-        int count = children.size();
-
-        for (int i = 0; i < count; i++)
+        for(UIComponent child : (List<UIComponent>)component.getChildren())
         {
-          UIComponent child = (UIComponent) children.get(i);
           if (child.isRendered())
+          {
             encodeChild(context, child);
+          }
         }
       }
       writer.endElement(XhtmlConstants.TABLE_ROW_ELEMENT);
@@ -1058,6 +1065,7 @@
       _disclosed = disclosed;
     }
 
+    @Override
     protected void renderAllAttributes(
        FacesContext        context,
        RenderingContext arc,
@@ -1065,45 +1073,53 @@
     {
     }
 
+    @Override
     protected boolean isTableAllDisclosure()
     {
       return true;
     }
 
+    @Override
     protected boolean renderAsInline()
     {
       return true;
     }
 
+    @Override
     protected String getValueParameter(UIComponent component)
     {
       return "all";
     }
 
 
+    @Override
     protected boolean getDisclosed(FacesBean bean)
     {
       return _disclosed;
     }
 
+    @Override
     protected String getDisclosedText(FacesBean bean)
     {
       RenderingContext arc = RenderingContext.getCurrentInstance();
       return arc.getTranslatedString(_HIDE_ALL_DETAILS_TEXT_KEY);
     }
 
+    @Override
     protected String getUndisclosedText(FacesBean bean)
     {
       RenderingContext arc = RenderingContext.getCurrentInstance();
       return arc.getTranslatedString(_SHOW_ALL_DETAILS_TEXT_KEY);
     }
 
+    @Override
     protected String getLinkId(String rootId, boolean disclosed)
     {
       String suffix = (disclosed ? "ha" : "sa");
       return XhtmlUtils.getCompositeId(rootId, suffix);
     }
 
+    @Override
     protected String getClientId(FacesContext context, UIComponent component)
     {
       TableRenderingContext tContext = TableRenderingContext.getCurrentInstance();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java Sun Aug  6 16:12:37 2006
@@ -58,9 +58,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(XhtmlConstants.EVENT_PARAM);
 
@@ -135,11 +138,13 @@
   /**
    * @return
    */
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext context, 
     RenderingContext arc, 
@@ -190,6 +195,7 @@
    * This is how we can render both the user defined styleClass and our
    * component style class
    */
+  @Override
   protected void renderStyleAttributes(
     FacesContext context, 
     RenderingContext arc, 
@@ -536,7 +542,7 @@
 
     renderStyleClass(context, arc, styleClass);
 
-    Map originalResourceKeyMap = arc.getSkinResourceKeyMap();
+    Map<String, String> originalResourceKeyMap = arc.getSkinResourceKeyMap();
     try
     {
       arc.setSkinResourceKeyMap(_RESOURCE_KEY_MAP);
@@ -799,7 +805,8 @@
 
   // for now keep the OraLink/OraDisabledLink styles on the 'a', and
   // append train link style class.
-  private static final Map _RESOURCE_KEY_MAP = new HashMap();
+  private static final Map<String, String> _RESOURCE_KEY_MAP = 
+    new HashMap<String, String>();
   private static final String _TRAIN_DISABLED_LINK = 
     XhtmlConstants.LINK_DISABLED_STYLE_CLASS + " " + 
     XhtmlConstants.AF_PROCESS_TRAIN_LINK_STYLE_CLASS;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java Sun Aug  6 16:12:37 2006
@@ -69,6 +69,7 @@
     super(CoreTreeTable.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -83,13 +84,17 @@
    *  DisclosureEvent
    * @todo deal with null and exceptions
    */
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(
     FacesContext context,
     UIComponent component)
   {
     decodeSelection(context, component);
 
-    Map parameters = context.getExternalContext().getRequestParameterMap();
+    Map<String, String> parameters = 
+      context.getExternalContext().getRequestParameterMap();
+    
     Object source = parameters.get(XhtmlConstants.SOURCE_PARAM);
     if (component.getClientId(context).equals(source))
     {
@@ -107,6 +112,7 @@
    * Creates the correct subclass of the TableRenderingContext to
    * use for this Renderer.
    */
+  @Override
   protected TableRenderingContext createRenderingContext(
     FacesContext        context,
     RenderingContext arc,
@@ -121,6 +127,7 @@
    * @return true if the table was empty, and an alternative empty
    * version was shown, false otherwise.
    */
+  @Override
   protected boolean renderTableWithoutColumns(
     FacesContext          context,
     RenderingContext   arc,
@@ -133,6 +140,7 @@
   /**
    * render all pieces of the table
    */
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -180,6 +188,7 @@
    * Render the navigation header bars, i.e. all the bars that appear above the
    * actual data table including the breadcrumbs at the end.
    */
+  @Override
   protected void renderNavigationHeaderBars(
     FacesContext          context,
     RenderingContext   arc,
@@ -191,6 +200,7 @@
     _renderBreadCrumbs(context, arc, tContext, component, bean);
   }
 
+  @Override
   protected final void renderRangePagingControl(
     FacesContext          context,
     RenderingContext   arc,
@@ -213,6 +223,7 @@
     }
   }
 
+  @Override
   protected boolean hasControlBarLinks(
     FacesContext context,
     RenderingContext arc,
@@ -224,6 +235,7 @@
       isExpandAllEnabled(component);
   }
 
+  @Override
   protected void renderControlBarLinks(
     FacesContext context,
     RenderingContext arc,
@@ -269,6 +281,7 @@
    * used to render special column headers, like select and details.
    * @return the next physicalColumnIndex
    */
+  @Override
   protected int renderSpecialColumns(
     FacesContext          context,
     RenderingContext   arc,
@@ -310,6 +323,7 @@
   /**
    * render all the table rows
    */
+  @Override
   protected void renderTableRows(
     FacesContext          context,
     RenderingContext   arc,
@@ -413,6 +427,7 @@
     }
   }
 
+  @SuppressWarnings("unchecked")
   private void _renderTableRows(
     FacesContext          context,
     final RenderingContext   arc,
@@ -420,11 +435,12 @@
   {
     final UIXTreeTable treeTableBase = ttrc.getUIXTreeTable();
     final ResponseWriter writer = context.getResponseWriter();
-    final RowKeySet treeState = treeTableBase.getDisclosedRowKeys();
+    final RowKeySet<Object> treeState = treeTableBase.getDisclosedRowKeys();
     final int specialColCount = _getSpecialColCount(ttrc);
 
     TableUtils.RowLoop loop = new TableUtils.RowLoop()
     {
+      @Override
       protected void loop(FacesContext context, CollectionComponent treeTable)
         throws IOException
       {
@@ -433,6 +449,7 @@
         processRow(context, treeTable);
       }
 
+      @Override
       protected void processRowImpl(FacesContext context, CollectionComponent treeTable)
         throws IOException
       {
@@ -520,6 +537,7 @@
 
   private static final class BreadCrumbsRenderer extends org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.BreadCrumbsRenderer
   {
+    @Override
     protected void renderLink(
       FacesContext context,
       RenderingContext arc,
@@ -547,7 +565,7 @@
       }
       Object oldPath = tree.getRowKey();
       Object focusRowKey = ttrc.getFocusRowKey();
-      List focusPath = tree.getAllAncestorContainerRowKeys(focusRowKey);
+      List<Object> focusPath = tree.getAllAncestorContainerRowKeys(focusRowKey);
       Object crumbPath = (renderedCount < focusPath.size())
         ? focusPath.get(renderedCount)
         : focusRowKey;
@@ -566,11 +584,13 @@
       out.endElement("a");
     }
 
+    @Override
     protected boolean hasChildren(UIComponent component)
     {
       return false; // do not render the columns. only the pathStamp
     }
 
+    @Override
     protected boolean shouldRenderId(
       FacesContext context,
       UIComponent  component)
@@ -580,6 +600,7 @@
       return false;
     }
 
+    @Override
     protected UIComponent getStamp(
       FacesContext        context,
       RenderingContext arc,
@@ -592,10 +613,13 @@
     }
   }
 
-  protected Map createResourceKeyMap()
+  @Override
+  protected Map<String, String> createResourceKeyMap()
   {
-    Map tablemap = super.createResourceKeyMap();
-    Map map = ResourceKeyUtils.convertResourceKeyMap(tablemap, "table", "treeTable");
+    Map<String, String> tablemap = super.createResourceKeyMap();
+    Map<String, String> map = 
+      ResourceKeyUtils.convertResourceKeyMap(tablemap, "table", "treeTable");
+    
     // we need a resource key map since we are using a navigationPath.
     // and we are using table for the styles
     map.put(XhtmlConstants.AF_NAVIGATION_PATH_SEPARATOR_ICON_NAME,
@@ -610,6 +634,7 @@
             XhtmlConstants.AF_TREE_TABLE_CONTROL_BAR_TOP_STYLE);
     map.put(XhtmlConstants.AF_TABLE_CONTROL_BAR_BOTTOM_STYLE,
             XhtmlConstants.AF_TREE_TABLE_CONTROL_BAR_BOTTOM_STYLE);
+    
     return Collections.unmodifiableMap(map);
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java Sun Aug  6 16:12:37 2006
@@ -58,6 +58,7 @@
   /**
    * @todo Integrate the time zone with RequestContext (somehow)
    */
+  @SuppressWarnings("unchecked")
   static public void service(FacesContext context)
     throws IOException
   {
@@ -181,16 +182,18 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   static public boolean processReturnDialog(
     FacesContext context
     )
   {
-    Map requestParameters = context.getExternalContext().
-                               getRequestParameterMap();
-    String event = (String) requestParameters.get(XhtmlConstants.EVENT_PARAM);
+    Map<String, String> requestParameters = 
+      context.getExternalContext().getRequestParameterMap();
+    
+    String event = requestParameters.get(XhtmlConstants.EVENT_PARAM);
     if (XhtmlConstants.DATE_EVENT.equals(event))
     {
-      String value = (String) requestParameters.get(XhtmlConstants.VALUE_PARAM);
+      String value = requestParameters.get(XhtmlConstants.VALUE_PARAM);
       Date date;
       try
       {
@@ -216,13 +219,16 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   static String __getParam(
     FacesContext context,
     String name
     )
   {
-    Map requestParams = context.getExternalContext().getRequestParameterMap();
-    String value = (String) requestParams.get(name);
+    Map<String, String> requestParams = 
+      context.getExternalContext().getRequestParameterMap();
+    
+    String value = requestParams.get(name);
     if (value == null || value.equals(""))
     {
       RequestContext afContext = RequestContext.getCurrentInstance();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarUtils.java Sun Aug  6 16:12:37 2006
@@ -36,6 +36,7 @@
  */
 class CalendarUtils
 {
+  @SuppressWarnings("unchecked")
   public static CoreChooseDate createChooseDate(FacesContext context)
   {
     final String id = CalendarDialogJSP.__getParam(context,
@@ -43,6 +44,7 @@
     
     CoreChooseDate ccd = new CoreChooseDate()
     {
+      @Override
       public String getClientId(FacesContext context)
       {
         return id;
@@ -68,7 +70,7 @@
     if (selectedTimeString != null)
     {
       ccd.getAttributes().put("value",
-                                   parseTime(selectedTimeString));
+                              parseTime(selectedTimeString));
     }
 
     String displayTimeString = CalendarDialogJSP.__getParam(context,
@@ -76,7 +78,7 @@
     if (displayTimeString != null)
     {
       ccd.getAttributes().put("scrolledValue",
-                                   parseTime(displayTimeString));
+                              parseTime(displayTimeString));
     }
 
     return ccd;
@@ -140,13 +142,11 @@
     // maximum date (in ChooseDateRenderer).
     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);
     }
     
     return dateValueInMs + tzOffset;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java Sun Aug  6 16:12:37 2006
@@ -51,10 +51,12 @@
  */
 class ColorPickerJSP
 {
+  @SuppressWarnings("unchecked")
   static public void service(FacesContext context)
     throws IOException
   {
-    Map requestParams = context.getExternalContext().getRequestParameterMap();
+    Map<String, String> requestParams = 
+      context.getExternalContext().getRequestParameterMap();
     
     RenderingContext arc = RenderingContext.getCurrentInstance();
     CoreDocument doc = new CoreDocument();
@@ -81,7 +83,7 @@
     sic.setOnkeypress("if(_getKC(event)==13){selectColor();return false}");
     Converter converter = _getConverter(requestParams);
     Object value = 
-      converter.getAsObject(context, sic, (String)requestParams.get("value"));
+      converter.getAsObject(context, sic, requestParams.get("value"));
     sic.setConverter(converter);
     sic.setValue(value);
     sic.setChooseId("choose");
@@ -134,9 +136,9 @@
     doc.getChildren().add(script);
   }
 
-  static private Converter _getConverter(Map requestParams)
+  static private Converter _getConverter(Map<String, String> requestParams)
   {
-    String pattern = (String) requestParams.get("pattern");
+    String pattern = requestParams.get("pattern");
     boolean allowsTransparent =
       "true".equals(requestParams.get("allowsTransparent"));
     ColorConverter converter = new ColorConverter();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/FredJSP.java Sun Aug  6 16:12:37 2006
@@ -26,7 +26,6 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.component.core.CoreImportScript;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
 import org.apache.myfaces.trinidad.component.html.HtmlHtml;
@@ -35,7 +34,6 @@
 import org.apache.myfaces.trinidad.component.html.HtmlScript;
 
 import org.apache.myfaces.trinidadinternal.context.PageFlowScopeProviderImpl;
-import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
 import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
 
@@ -94,6 +92,7 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   static void service(FacesContext context) throws IOException
   {
     RenderingContext arc = RenderingContext.getCurrentInstance();
@@ -103,10 +102,12 @@
     HtmlHtml root = new HtmlHtml();
     context.getViewRoot().getChildren().add(root);
 
-    Map requestParameters = context.getExternalContext().getRequestParameterMap();
+    Map<String, String> requestParameters = 
+      context.getExternalContext().getRequestParameterMap();
+    
     // Save the return ID - and do so before generating the
     // link to the frames!
-    String returnId = (String) requestParameters.get(_RETURN_ID_PARAM);
+    String returnId = requestParameters.get(_RETURN_ID_PARAM);
     if (returnId != null)
       CoreRenderKit.saveDialogPostbackValues(returnId);
 
@@ -148,13 +149,13 @@
        context.getExternalContext().getRequestParameterValuesMap());
 
     // grab any sizing parameters
-    String widthParam = (String) requestParameters.get(_MIN_WIDTH_PARAM);
+    String widthParam = requestParameters.get(_MIN_WIDTH_PARAM);
     boolean gotWidth = (widthParam != null);
 
-    String heightParam = (String) requestParameters.get(_MIN_HEIGHT_PARAM);
+    String heightParam = requestParameters.get(_MIN_HEIGHT_PARAM);
     boolean gotHeight = (heightParam != null);
 
-    String viewIdRedirect = (String) requestParameters.get(_VIEW_ID_REDIRECT_PARAM);
+    String viewIdRedirect = requestParameters.get(_VIEW_ID_REDIRECT_PARAM);
     if (viewIdRedirect != null)
     {
       ViewHandler vh =
@@ -169,7 +170,7 @@
     }
     else
     {
-      String internalRedirect = (String) requestParameters.get("_red");
+      String internalRedirect = requestParameters.get("_red");
       if (internalRedirect != null)
       {
         String path = GenericEntry.getGenericEntryURL(context,
@@ -241,25 +242,25 @@
   }
 
   static private String _getQueryString(
-    Map                parameters) throws IOException
+    Map<String, String[]> parameters) throws IOException
   {
     // Bug #3419817 support request dispatch for Portal
     // build up the encoded query string from request parameters
     // this will work for both direct requests and include/forward requests
     StringBuffer buf = new StringBuffer();
-    Iterator paramNames = parameters.keySet().iterator();
+    Iterator<String> paramNames = parameters.keySet().iterator();
     boolean isFirst = true;
 
     // iterate through the request parameter names
     while (paramNames.hasNext())
     {
-      String paramName = (String)paramNames.next();
+      String paramName = paramNames.next();
 
       // add the parameter to the query string unless skipped
       if (!_SKIP_PARAMS.contains(paramName))
       {
         // the parameter might appear on the request more than once
-        String[] paramValues = (String[]) parameters.get(paramName);
+        String[] paramValues = parameters.get(paramName);
 
         for (int i=0; i < paramValues.length; i++)
         {
@@ -297,7 +298,7 @@
   static private final String _FRAMESET_ONUNLOAD_TEXT =
     "_checkUnload(event)";
 
-  static private final Collection _SKIP_PARAMS =
+  static private final Collection<String> _SKIP_PARAMS =
     Arrays.asList(new String[]
                   {
                     GenericEntry.__ENTRY_KEY_PARAM,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/GenericEntry.java Sun Aug  6 16:12:37 2006
@@ -75,16 +75,19 @@
   {
   }
 
+  @Override
   public UIViewRoot createView(FacesContext context, String viewId)
   {
     return null;
   }
 
+  @Override
   public UIViewRoot restoreView(FacesContext context, String viewId)
   {
     return null;
   }
 
+  @Override
   public void renderView(
     FacesContext context,
     UIViewRoot   viewToRender) throws IOException, FacesException
@@ -171,6 +174,7 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   static private void service(FacesContext context, String name)
     throws IOException
   {
@@ -184,7 +188,7 @@
 
     if (!_isValidEntry(name))
     {
-      response.sendError(response.SC_BAD_REQUEST);
+      response.sendError(HttpServletResponse.SC_BAD_REQUEST);
       return;
     }
 
@@ -207,8 +211,10 @@
       encoding);
     context.setResponseWriter(responseWriter);
 
-    Map requestParams = context.getExternalContext().getRequestParameterMap();
-    String localeName = (String) requestParams.get("loc");
+    Map<String, String> requestParams = 
+      context.getExternalContext().getRequestParameterMap();
+    
+    String localeName = requestParams.get("loc");
     if (localeName != null)
     {
       Locale locale =
@@ -266,11 +272,11 @@
   // Parameter that is used to store the key for the JSP name.
   //
   static final String __ENTRY_KEY_PARAM = "_t";
-  static private final Set _VALID_ENTRIES;
+  static private final Set<String> _VALID_ENTRIES;
 
   static
   {
-    _VALID_ENTRIES = new HashSet();
+    _VALID_ENTRIES = new HashSet<String>();
     _VALID_ENTRIES.add(NEW_FRAME_REDIRECT_ENTRY);
     _VALID_ENTRIES.add(CALENDAR_DIALOG_ENTRY);
     _VALID_ENTRIES.add(INLINE_DATE_PICKER_ENTRY);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/InlineDatePickerJSP.java Sun Aug  6 16:12:37 2006
@@ -46,14 +46,16 @@
  */
 class InlineDatePickerJSP
 {
+  @SuppressWarnings("unchecked")
   static public void service(FacesContext context)
     throws IOException
   {
-    Map requestParams = context.getExternalContext().getRequestParameterMap();
+    Map<String, String> requestParams = 
+      context.getExternalContext().getRequestParameterMap();
 
     RenderingContext arc = RenderingContext.getCurrentInstance();
     arc.getPartialPageContext().addPartialTarget(
-              (String) requestParams.get(XhtmlConstants.SOURCE_PARAM));
+              requestParams.get(XhtmlConstants.SOURCE_PARAM));
 
     // Use Html and Body to avoid the cost of the stylesheet
     HtmlHtml html = new HtmlHtml();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java Sun Aug  6 16:12:37 2006
@@ -30,6 +30,7 @@
                 new TrainRenderer());
   }
 
+  @Override
   protected String getDecoratedRenderKitId()
   {
     return CoreRenderKit.BASE_RENDER_KIT_ID;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java Sun Aug  6 16:12:37 2006
@@ -53,6 +53,7 @@
     super(CoreTable.TYPE);
   }
   
+  @Override
   protected final void renderControlBar(
     FacesContext          context,
     RenderingContext   arc,
@@ -102,6 +103,7 @@
     }
   }
 
+  @Override
   protected void renderSubControlBar(
     FacesContext context,
     RenderingContext arc,
@@ -133,6 +135,7 @@
   }
 
   // render the actual table content, with headers
+  @Override
   protected void renderTableContent(
     FacesContext context,
     final RenderingContext arc,
@@ -235,6 +238,7 @@
     {
       TableUtils.RowLoop loop = new TableUtils.RowLoop()
         {
+          @Override
           protected void processRowImpl(FacesContext fc, CollectionComponent tableBase)
             throws IOException
           {
@@ -289,7 +293,8 @@
     //context.setDataResponseWriterUsed(false);
   }
   
-     private void _renderColumnFooter(
+     @SuppressWarnings("unchecked")
+    private void _renderColumnFooter(
        FacesContext          context,
        RenderingContext   arc,
        TableRenderingContext tContext,
@@ -331,14 +336,12 @@
            colData.setColumnIndex(tContext.getSpecialColumnCount(),
                                   0/*logicalColumnIndex*/);
 
-           List children = component.getChildren();
-           int count = children.size();
-
-           for (int i = 0; i < count; i++)
+           for(UIComponent child : (List<UIComponent>)component.getChildren())
            {
-             UIComponent child = (UIComponent) children.get(i);
              if (child.isRendered())
+             {
                encodeChild(context, child);
+             }
            }
          }
          writer.endElement(XhtmlConstants.TABLE_ROW_ELEMENT);
@@ -346,6 +349,7 @@
      }
 
 
+  @Override
   protected final void renderSingleRow(
     FacesContext          context,
     RenderingContext   arc,

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

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java Sun Aug  6 16:12:37 2006
@@ -37,8 +37,11 @@
     super(out);
     _pprContext = pprContext;
     _useXMLDom = useXMLDom;
+    _componentStack = new ArrayList<PPRTag>(50);
+    _facesContext = FacesContext.getCurrentInstance();
   }
 
+  @Override
   public ResponseWriter cloneWithWriter(Writer writer)
   {
     return new PPRResponseWriter(
@@ -47,24 +50,28 @@
       _useXMLDom);
   }
 
+  @Override
   public void startDocument() throws IOException
   {
     if (_isInsideTarget())
       super.startDocument();
   }
 
+  @Override
   public void endDocument() throws IOException
   {
     if (_isInsideTarget())
       super.endDocument();
   }
 
+  @Override
   public void flush() throws IOException
   {
     if (_isInsideTarget())
       super.flush();
   }
 
+  @Override
   public void writeComment(Object text) throws IOException
   {
     if (_isInsideTarget())
@@ -72,28 +79,31 @@
   }
 
 
+  @Override
   public void writeText(Object text, String property) throws IOException
   {
     if (_isInsideTarget())
       super.writeText(text, property);
   }
 
+  @Override
   public void writeText(
-                        char[]      text,
-                        int         start,
-                        int         length) throws IOException
+      char[]      text,
+      int         start,
+      int         length) throws IOException
   {
     if (_isInsideTarget())
       super.writeText(text, start, length);
   }
 
-
+  @Override
   public void write(String text) throws IOException
   {
     if (_isInsideTarget())
       super.write(text);
   }
 
+  @Override
   public void write(
                     char[]      text,
                     int         start,
@@ -103,12 +113,14 @@
       super.write(text, start, length);
   }
 
+  @Override
   public void write(int ch) throws IOException
   {
     if (_isInsideTarget())
       super.write(ch);
   }
 
+  @Override
   public void startElement(String name, UIComponent component)
      throws IOException
   {
@@ -137,7 +149,7 @@
     }
   }
 
-
+  @Override
   public void endElement(String name) throws IOException
   {
     if (_isInsideTarget())
@@ -148,6 +160,7 @@
     _popPartialTarget();
   }
 
+  @Override
   public void writeAttribute(String     name,
                              Object     value,
                              String     property) throws IOException
@@ -165,6 +178,7 @@
     }
   }
 
+  @Override
   public void writeURIAttribute(
                                 String     name,
                                 Object     value,
@@ -230,7 +244,7 @@
   private void _popPartialTarget() throws IOException
   {
     int pos = _componentStack.size() - 1;
-    PPRTag tag = (PPRTag) _componentStack.get(pos);
+    PPRTag tag = _componentStack.get(pos);
     _componentStack.remove(pos);
 
     if (tag != null)
@@ -329,6 +343,7 @@
       _tags = tags;
     }
 
+    @Override
     public void start(PartialPageContext pprContext) throws IOException
     {
       super.start(pprContext);
@@ -340,6 +355,7 @@
       }
     }
 
+    @Override
     public void finish(PartialPageContext pprContext) throws IOException
     {
       // And then end them in reverse order...
@@ -358,10 +374,9 @@
 
   private boolean _writingForm;
   private final boolean _useXMLDom;
-  private final List _componentStack = new ArrayList(50);
+  private final List<PPRTag> _componentStack;
   private final PartialPageContext _pprContext;
-  private final FacesContext _facesContext =
-     FacesContext.getCurrentInstance();
+  private final FacesContext _facesContext;
 
   static private final String[] _ADD_TABLE_AND_TR =
      new String[]{"table", "tr"};

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java Sun Aug  6 16:12:37 2006
@@ -49,11 +49,11 @@
 {
   PartialPageContext()
   {
-    _targets = new HashMap();
-    _renderedTargets = new HashSet();
+    _targets = new HashMap<String, Boolean>();
+    _renderedTargets = new HashSet<String>();
 
     // Pre-allocate the rendered stack
-    _currentTargetStack = new Stack();
+    _currentTargetStack = new Stack<String>();
   }
 
   /**
@@ -71,7 +71,7 @@
     // target list.
     RequestContextImpl adfContext =
       (RequestContextImpl) afContext;
-    Iterator targetIter = adfContext.getPartialTargets();
+    Iterator<String> targetIter = adfContext.getPartialTargets();
     while (targetIter.hasNext())
       _targets.put(targetIter.next(), Boolean.FALSE);
 
@@ -85,10 +85,8 @@
   {
     if (_LOG.isWarning())
     {
-      Iterator entries = _targets.entrySet().iterator();
-      while (entries.hasNext())
+      for(Map.Entry<String, Boolean> entry : _targets.entrySet())
       {
-        Map.Entry entry = (Map.Entry) entries.next();
         if (entry.getValue() == Boolean.FALSE)
           _LOG.warning("PPR target {0} was not rendered.",
                        entry.getKey());
@@ -100,7 +98,7 @@
   /**
    * Returns the set of partial targets for this rendering pass.
    */
-  public Iterator getPartialTargets()
+  public Iterator<String> getPartialTargets()
   {
     return _targets.keySet().iterator();
   }
@@ -165,7 +163,7 @@
     _renderedTargets.add(id);
   }
 
-  public Iterator getRenderedPartialTargets()
+  public Iterator<String> getRenderedPartialTargets()
   {
     return _renderedTargets.iterator();
   }
@@ -237,14 +235,16 @@
     if (_currentTargetStack.empty())
       return null;
 
-    return (String)_currentTargetStack.peek();
+    return _currentTargetStack.peek();
   }
 
-  private Map _targets;
-  private Set _renderedTargets;
+  private Map<String, Boolean> _targets;
+  private Set<String> _renderedTargets;
 
   // The stack of partial targets that are currently being rendered
-  private Stack    _currentTargetStack;
+  // -= Simon Lessard =-
+  // FIXME: java.util.Stack... enough said... ArrayList or LinkedList please
+  private Stack<String> _currentTargetStack;
 
   private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(PartialPageContext.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/ScriptBufferingResponseWriter.java Sun Aug  6 16:12:37 2006
@@ -38,13 +38,16 @@
  */
 public class ScriptBufferingResponseWriter extends ResponseWriterDecorator
 {
+  @SuppressWarnings("unchecked")
   public ScriptBufferingResponseWriter(
      FacesContext   context,
      ResponseWriter output)
   {
     this(output, null);
 
-    Map requestScope = context.getExternalContext().getRequestMap();
+    Map<String, Object> requestScope = 
+      context.getExternalContext().getRequestMap();
+    
     // To support multiple Partial Roots, always look for past
     // data from a rendered partial request.
     _data = (Data) requestScope.get(_STORED_DATA_KEY);
@@ -96,7 +99,7 @@
    * Returns objects representing any JavaScript libraries that
    * have been rendered during buffering.
    */
-  public Iterator getBufferedLibraries()
+  public Iterator<Object> getBufferedLibraries()
   {
     if (_data.libraries == null)
       return null;
@@ -104,6 +107,7 @@
     return _data.libraries.iterator();
   }
 
+  @Override
   public ResponseWriter cloneWithWriter(Writer writer)
   {
     return new ScriptBufferingResponseWriter(
@@ -111,6 +115,7 @@
       _data);
   }
 
+  @Override
   public void writeComment(Object text) throws IOException
   {
     // Don't bother write out comments if we are buffering
@@ -118,6 +123,7 @@
       super.writeComment(text);
   }
 
+  @Override
   public void writeText(Object text, String property) throws IOException
   {
     if (_checkBuffer())
@@ -126,6 +132,7 @@
       super.writeText(text, property);
   }
 
+  @Override
   public void writeText(
     char[]      text,
     int         start,
@@ -138,6 +145,7 @@
   }
 
 
+  @Override
   public void write(String text) throws IOException
   {
     if (_checkBuffer())
@@ -146,6 +154,7 @@
       super.write(text);
   }
 
+  @Override
   public void write(
     char[]      text,
     int         start,
@@ -157,6 +166,7 @@
       super.write(text, start, length);
   }
 
+  @Override
   public void write(int ch) throws IOException
   {
     if (_checkBuffer())
@@ -165,6 +175,7 @@
       super.write(ch);
   }
 
+  @Override
   public void startElement(String name,
                            UIComponent component) throws IOException
   {
@@ -192,6 +203,7 @@
       super.startElement(name, component);
   }
 
+  @Override
   public void endElement(String name) throws IOException
   {
     if (_isScript(name))
@@ -204,7 +216,7 @@
       {
         // Add the library to the our list
         if (_data.libraries == null)
-          _data.libraries = new ArrayList(10);
+          _data.libraries = new ArrayList<Object>(10);
 
         _data.libraries.add(source);
       }
@@ -241,6 +253,7 @@
       super.endElement(name);
   }
 
+  @Override
   public void writeAttribute(
     String     name,
     Object     value,
@@ -252,6 +265,7 @@
       super.writeAttribute(name, value, property);
   }
 
+  @Override
   public void writeURIAttribute(
     String     name,
     Object     value,
@@ -296,12 +310,12 @@
     // the script start element now.
     super.startElement("script", null);
 
-    Iterator keys = _data.attrs.keys();
+    Iterator<String> keys = _data.attrs.keys();
     if (keys != null)
     {
       while (keys.hasNext())
       {
-        String key = (String)keys.next();
+        String key = keys.next();
         super.writeAttribute(key, _data.attrs.get(key), null);
       }
     }
@@ -311,7 +325,7 @@
     {
       while (keys.hasNext())
       {
-        String key = (String)keys.next();
+        String key = keys.next();
         super.writeURIAttribute(key, _data.uriAttrs.get(key), null);
       }
     }
@@ -355,17 +369,18 @@
   {
     public Data()
     {
-      attrs = new ArrayMap(3);
-      uriAttrs = new ArrayMap(1);
+      attrs = new ArrayMap<String, Object>(3);
+      uriAttrs = new ArrayMap<String, Object>(1);
+      objectSuffix = 0;
     }
 
-    public boolean      inScriptStart;  // Inside a script start element?
-    public ArrayMap     attrs;          // Attrs of the script element
-    public ArrayMap     uriAttrs;       // URI attrs of the script element
-    public boolean      buffering;      // Are currently buffering?
-    public StringBuffer buffer;         // The buffer
-    public ArrayList    libraries;      // Imported JavaScript libraries
-    public int          objectSuffix=0; // For the object element ppr bug
+    public boolean                  inScriptStart;        // Inside a script start element?
+    public ArrayMap<String, Object> attrs;                // Attrs of the script element
+    public ArrayMap<String, Object> uriAttrs;             // URI attrs of the script element
+    public boolean                  buffering;            // Are currently buffering?
+    public StringBuffer             buffer;               // The buffer
+    public ArrayList<Object>        libraries;            // Imported JavaScript libraries
+    public int                      objectSuffix;         // For the object element ppr bug
   }
 
   // This utility method is used to strip /**/ style comments out of

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java Sun Aug  6 16:12:37 2006
@@ -46,6 +46,7 @@
    * Returns the id for the desktop implementation of the Base
    * Look And Feel: "base.desktop".
    */
+  @Override
   public String getId()
   {
     return BaseDesktopConstants.BASE_DESKTOP_ID;
@@ -55,6 +56,7 @@
    * Returns the family for the Base
    * Look And Feel: "base".
    */
+  @Override
   public String getFamily()
   {
     return "base";
@@ -64,6 +66,7 @@
   /**
    * Returns the renderKitId for the BaseDesktopSkin: "org.apache.myfaces.trinidad.desktop".
    */
+  @Override
   public String getRenderKitId()
   {
     return ORACLE_ADF_DESKTOP;
@@ -72,6 +75,7 @@
   /**
    * Returns the name of the XSS style sheet for this Skin.
    */
+  @Override
   public String getStyleSheetName()
   {
     return "base-desktop.xss";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java Sun Aug  6 16:12:37 2006
@@ -31,11 +31,13 @@
   /**
    * Returns the name of the XSS style sheet for this Skin.
    */
+  @Override
   public String getStyleSheetName()
   {
     return null;
   }
 
+  @Override
   protected String getBundleName()
   {
     return null;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java Sun Aug  6 16:12:37 2006
@@ -52,10 +52,11 @@
   /**
    * Override of Icon.renderIcon().
    */
+  @Override
   public void renderIcon(
     FacesContext        context,
-    RenderingContext arc,
-    Map              attrs
+    RenderingContext    arc,
+    Map<String, Object> attrs
     ) throws IOException
   {
     Icon icon = _getIcon(arc);
@@ -66,6 +67,7 @@
   /**
    * Override of Icon.getImageURI().
    */
+  @Override
   public Object getImageURI(
     FacesContext        context,
     RenderingContext arc)
@@ -78,6 +80,7 @@
   /**
    * Override of Icon.getImageWidth().
    */
+  @Override
   public Integer getImageWidth(RenderingContext arc)
   {
     Icon icon = _getIcon(arc);
@@ -88,6 +91,7 @@
   /**
    * Override of Icon.getImageHeight().
    */
+  @Override
   public Integer getImageHeight(RenderingContext arc)
   {
     Icon icon = _getIcon(arc);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java Sun Aug  6 16:12:37 2006
@@ -38,6 +38,7 @@
   /**
    * Returns the name of the XSS style sheet for this Skin.
    */
+  @Override
   public String getStyleSheetName()
   {
     return "META-INF/adf/styles/simple-desktop.xss";
@@ -46,6 +47,7 @@
   /**
    * Returns the id of this simple desktop Skin "simple.desktop".
    */
+  @Override
   public String getId()
   {
     return "simple.desktop";
@@ -55,6 +57,7 @@
    * Returns the family for the Simple
    * Skin: "simple".
    */
+  @Override
   public String getFamily()
   {
     return "simple";
@@ -63,6 +66,7 @@
   /**
    * Returns the renderKitId for the SimpleDesktopSkin: "org.apache.myfaces.trinidad.desktop".
    */  
+  @Override
   public String getRenderKitId()
   {
     return ORACLE_ADF_DESKTOP;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java Sun Aug  6 16:12:37 2006
@@ -28,6 +28,7 @@
   /**
    * Returns the name of the XSS style sheet for this Skin.
    */
+  @Override
   public String getStyleSheetName()
   {
     return "META-INF/adf/styles/simple-pda.xss";
@@ -37,6 +38,7 @@
    * Returns the id for the PDA implementation of the Simple
    * Skin: "simple.pda".
    */
+  @Override
   public String getId()
   {
     return "simple.pda";
@@ -46,6 +48,7 @@
    * Returns the family for the PDA implementation of the Simple
    * Skin: "simple.pda".
    */
+  @Override
   public String getFamily()
   {
     return "simple";
@@ -55,10 +58,9 @@
    * Returns the renderKitId for the PDA implementation of the Simple
    * Skin: "org.apache.myfaces.trinidad.pda".
    */  
+  @Override
   public String getRenderKitId()
   {
     return ORACLE_ADF_PDA;
   }
-
-
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/TranslatedTextIcon.java Sun Aug  6 16:12:37 2006
@@ -37,12 +37,11 @@
   /**
    * Returns the text to render.
    */
+  @Override
   protected String getText(RenderingContext arc)
   {
-   return arc.getTranslatedString(_key);
-
+    return arc.getTranslatedString(_key);
   }
-
 
   private String _key;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/XhtmlSkin.java Sun Aug  6 16:12:37 2006
@@ -44,6 +44,7 @@
   /**
    * @todo Move the "BLAF" bundle to a more generic location.
    */
+  @Override
   protected String getBundleName()
   {
     return _BUNDLE_CLASS;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.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/AutoSubmitUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java Sun Aug  6 16:12:37 2006
@@ -50,6 +50,7 @@
    * Find all UIParameter children of a component, and
    * return it as a JS string of "name1:value1,name2:value2".
    */
+  @SuppressWarnings("unchecked")
   public static String getParameters(UIComponent comp)
   {
     int childCount = comp.getChildCount();
@@ -57,10 +58,8 @@
       return null;
       
     StringBuffer buffer = null;
-    List children = comp.getChildren();
-    for (int i = 0; i < childCount; i++)
+    for(UIComponent child : (List<UIComponent>)comp.getChildren())
     {
-      UIComponent child = (UIComponent) children.get(i);
       if (child instanceof UIParameter)
       {
         UIParameter param = (UIParameter) child;
@@ -283,11 +282,13 @@
       return _sInstance;
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _AUTO_SUBMIT_SCRIPTLET;
     }
 
+    @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/BodyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.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/BodyRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java Sun Aug  6 16:12:37 2006
@@ -52,6 +52,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -61,7 +62,7 @@
     _onunloadKey = type.findKey("onunload");
   }
 
-
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -78,6 +79,7 @@
     _writeVersionInformation(context, arc);
   }
 
+  @Override
   protected void renderAtEnd(
     FacesContext context,
     RenderingContext arc) throws IOException
@@ -87,6 +89,7 @@
     _renderInitialFocusScript(context, arc);
   }
 
+  @Override
   protected void renderPPRSupport(
     FacesContext        context,
     RenderingContext arc,
@@ -105,6 +108,7 @@
     }
   }
 
+  @Override
   protected void renderContent(
     FacesContext        context,
     RenderingContext arc,
@@ -136,12 +140,13 @@
     }
   }
 
+  @Override
   protected String getStyleClass(FacesBean bean)
   {
-    String styleClass = super.getStyleClass(bean);
-    return styleClass;
+    return super.getStyleClass(bean);
   }
 
+  @Override
   protected void renderEventHandlers(
     FacesContext context,
     FacesBean    bean) throws IOException
@@ -399,11 +404,11 @@
   {
     String comment = _VERSION_COMMENT;
 
-    Class implClass = BodyRenderer.class;
+    Class<BodyRenderer> implClass = BodyRenderer.class;
     Package implPkg = implClass.getPackage();
 
-    Class apiClass  =  FacesBean.class;
-    Package apiPkg  =  apiClass.getPackage();
+    Class<FacesBean> apiClass  =  FacesBean.class;
+    Package apiPkg = apiClass.getPackage();
 
     String versionInfo = _getVersionInfo(apiPkg, implPkg);
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.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/BreadCrumbsRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BreadCrumbsRenderer.java Sun Aug  6 16:12:37 2006
@@ -45,18 +45,20 @@
     super(CoreBreadCrumbs.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _orientationKey = type.findKey("orientation");
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
   
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -96,6 +98,7 @@
     return stamp;
   }
 
+  @SuppressWarnings("unchecked")
   protected void renderContent(
     FacesContext        context,
     RenderingContext arc,
@@ -123,7 +126,9 @@
       if (focusPath == null)
         return;
       
-      List paths = new ArrayList(component.getAllAncestorContainerRowKeys(focusPath));
+      List<Object> paths = 
+        new ArrayList<Object>(component.getAllAncestorContainerRowKeys(focusPath));
+      
       paths.add(focusPath);
       int size = paths.size();        
 
@@ -153,11 +158,11 @@
     // now render children
     if (hasChildren(component))
     {
-      List children = component.getChildren();
+      List<UIComponent> children = component.getChildren();
       nextVisChildIndex = getNextRenderedChildIndex(children, -1);
       while (nextVisChildIndex != NO_CHILD_INDEX)
       {
-        UIComponent child = (UIComponent)children.get(nextVisChildIndex);        
+        UIComponent child = children.get(nextVisChildIndex);        
         nextVisChildIndex = getNextRenderedChildIndex(children, 
                                                       nextVisChildIndex);
         isLastChild = (nextVisChildIndex == NO_CHILD_INDEX);           
@@ -249,7 +254,7 @@
       isBidi = Bidi.requiresBidi(firstChar, 0, 1);
     }
     
-    Map originalResourceKeyMap = arc.getSkinResourceKeyMap();
+    Map<String, String> originalResourceKeyMap = arc.getSkinResourceKeyMap();
     try
     {
       arc.setSkinResourceKeyMap(_RESOURCE_KEY_MAP);
@@ -287,6 +292,7 @@
    * renderStyleAttributes - use the NavigationPath style class as the default
    * styleClass
    */
+  @Override
   protected void renderStyleAttributes(
     FacesContext        context,
     RenderingContext arc,
@@ -401,9 +407,11 @@
   private static final int _INDENT_SPACES = 10;  
   
   
-  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(
       XhtmlConstants.LINK_STYLE_CLASS,
       XhtmlConstants.AF_NAVIGATION_PATH_STEP_STYLE_CLASS);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.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/ChooseDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java Sun Aug  6 16:12:37 2006
@@ -71,6 +71,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -81,11 +82,13 @@
     _destinationKey = PropertyKey.createPropertyKey("destination");
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected boolean shouldRenderId(
     FacesContext context,
     UIComponent  component)
@@ -93,6 +96,7 @@
     return true;
   }
 
+  @Override
   protected final void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -1113,6 +1117,7 @@
   }
 
 
+  @SuppressWarnings("deprecation")
   private static long _getTimeAttr(
     RenderingContext arc,
     FacesBean   bean,
@@ -1165,13 +1170,11 @@
         // maximum date.
         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.
@@ -1542,12 +1545,7 @@
 
   private static final int _MILLIS_IN_DAY = 1000 * 60 * 60 * 24;
 
-  // =-= bts
-  // default minimum date is 1AD so we don't have to deal with years in
-  // different eras.  Hopefully this won't be a problem in other calendars
-  // (but I think that it will)
-  private static final long _MIN_TIME =
-    (new Date(-1899, 1, 1, 0, 0)).getTime();
+  private static final long _MIN_TIME;
 
   private static final long _MAX_TIME = Long.MAX_VALUE;
 
@@ -1555,6 +1553,17 @@
   // Rendering Context cache keys
   //
   private static final Object _DATE_SYMBOLS_KEY = new Object();
+  
+  static
+  {
+    // =-= bts
+    // default minimum date is 1AD so we don't have to deal with years in
+    // different eras.  Hopefully this won't be a problem in other calendars
+    // (but I think that it will)
+    Calendar cal = Calendar.getInstance();
+    cal.set(1, 1, 1, 0, 0);
+    _MIN_TIME = cal.getTimeInMillis();
+  }
 
   private PropertyKey _maxValueKey;
   private PropertyKey _minValueKey;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.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/ColumnGroupRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java Sun Aug  6 16:12:37 2006
@@ -61,6 +61,7 @@
     super(CoreColumn.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -76,7 +77,7 @@
     _defaultSortOrderKey = type.findKey("defaultSortOrder");
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
@@ -180,6 +181,7 @@
   /**
    * @todo Will need to support TREE_NODE_STAGE
    */
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -513,7 +515,7 @@
     String sortJS = buffer.toString();
     if (onclick != null)
     {
-      sortJS = (String) XhtmlUtils.getChainedJS(onclick, sortJS, true);
+      sortJS = XhtmlUtils.getChainedJS(onclick, sortJS, true);
     }
 
     return sortJS;
@@ -632,11 +634,11 @@
     // Otherwise, look at the first sort criteria
     // =-=AEW This seems slow...
     UIXCollection table = (UIXCollection) tContext.getTable();
-    List criteria = table.getSortCriteria();
+    List<SortCriterion> criteria = table.getSortCriteria();
     // We currently only show anything for the primary sort criterion
     if (criteria.size() > 0)
     {
-      SortCriterion criterion = (SortCriterion) criteria.get(0);
+      SortCriterion criterion = criteria.get(0);
       if (property.equals(criterion.getProperty()))
       {
         return criterion.isAscending() ? SORT_ASCENDING : SORT_DESCENDING;
@@ -717,24 +719,27 @@
     _setParentNode(tContext, parentNode);
   }
 
-
+  @SuppressWarnings("unchecked")
   private void _renderChildren(FacesContext context,
                                UIComponent  component,
                                NodeData     parentNode)
     throws IOException
   {
-    List children = component.getChildren();
-    int size = children.size();
-    for (int i = 0; i < size; i++)
+    int i = 0;
+    for(UIComponent child : (List<UIComponent>)component.getChildren())
     {
-      UIComponent child = (UIComponent) children.get(i);
       if (child.isRendered())
       {
         // Tell the parent node - if there is one - which child we're rendering
         if (parentNode != null)
+        {
           parentNode.currentChild = i;
+        }
+        
         encodeChild(context, child);
       }
+      
+      i++;
     }
   }
 
@@ -790,7 +795,7 @@
 
   private static final class NodeList
   {
-    private final ArrayList _list = new ArrayList(10);
+    private final ArrayList<NodeData> _list = new ArrayList<NodeData>(10);
     private int _index = 0;
 
     public NodeData currentNode = null;
@@ -805,7 +810,7 @@
       if (_index >= _list.size())
         _index = 0;
 
-      return (NodeData) _list.get(_index++);
+      return _list.get(_index++);
     }
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.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/ColumnRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnRenderer.java Sun Aug  6 16:12:37 2006
@@ -46,10 +46,10 @@
     super();
   }
 
-
   /**
    * @todo Will need to support TREE_NODE_STAGE
    */
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -114,9 +114,10 @@
     colData.incrementColumnIndex();
   }
 
+  @SuppressWarnings("unchecked")
   private boolean _isColumnGroup(UIComponent column)
   {
-    Iterator kids = column.getChildren().iterator();
+    Iterator<UIComponent> kids = column.getChildren().iterator();
     // Special columns - nothing is a column group
     if (!kids.hasNext())
       return false;
@@ -125,17 +126,15 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   protected void renderKids(FacesContext          context,
-                            RenderingContext   arc,
+                            RenderingContext      arc,
                             TableRenderingContext trc,
                             UIComponent           column) throws IOException
   {
-    List children = column.getChildren();
     boolean renderedOne = false;
-    int size = children.size();
-    for (int i = 0; i < size; i++)
+    for(UIComponent child : (List<UIComponent>)column.getChildren())
     {
-      UIComponent child = (UIComponent) children.get(i);
       if (child.isRendered())
       {
         // Put each component on a separate line, separated by a div

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.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/CommandLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java Sun Aug  6 16:12:37 2006
@@ -38,6 +38,7 @@
     super(CoreCommandLink.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -45,6 +46,8 @@
     _partialSubmitKey = type.findKey("partialSubmit");
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
     RequestContext afContext = RequestContext.getCurrentInstance();
@@ -56,7 +59,9 @@
     }
     else
     {
-      Map parameterMap = context.getExternalContext().getRequestParameterMap();
+      Map<String, String> parameterMap = 
+        context.getExternalContext().getRequestParameterMap();
+      
       Object source = parameterMap.get("source");
       String clientId = component.getClientId(context);
 
@@ -71,6 +76,7 @@
     }
   }
   
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -99,6 +105,7 @@
     arc.setCurrentClientId(null);
   }
 
+  @Override
   public void encodeEnd(
     FacesContext        context,
     RenderingContext arc,
@@ -111,6 +118,7 @@
       fd.addNeededValue(XhtmlConstants.SOURCE_PARAM);
   }
 
+  @Override
   protected String getClientId(
     FacesContext context,
     UIComponent  component)
@@ -119,23 +127,26 @@
     return RenderingContext.getCurrentInstance().getCurrentClientId();
   }
 
+  @Override
   protected String getDestination(FacesBean bean)
   {
     return null;
   }
 
+  @Override
   protected String getTargetFrame(FacesBean bean)
   {
     return null;
   }
 
-
+  @Override
   protected boolean hasOnclick(FacesBean bean)
   {
     // More efficient
     return true;
   }
 
+  @Override
   protected String getOnclick(FacesBean bean)
   {
     String onclick = super.getOnclick(bean);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.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/DesktopPanelPageHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DesktopPanelPageHeaderRenderer.java Sun Aug  6 16:12:37 2006
@@ -47,17 +47,20 @@
     super(CorePanelPageHeader.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _chromeTypeKey = type.findKey("chromeType");
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.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/DocumentRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/DocumentRenderer.java Sun Aug  6 16:12:37 2006
@@ -45,6 +45,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -53,11 +54,13 @@
     _body = new BodyRenderer(type);
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -83,6 +86,7 @@
       super(type);
     }
 
+    @Override
     protected String getClientId(
       FacesContext context,
       UIComponent  component)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.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/EditableValueRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java Sun Aug  6 16:12:37 2006
@@ -25,6 +25,7 @@
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.el.ValueBinding;
+import javax.faces.validator.Validator;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
@@ -40,6 +41,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
    {
     super.findTypeConstants(type);
@@ -54,6 +56,7 @@
   //
   // DECODING IMPLEMENTATION
   //
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
     if (skipDecode(context))
@@ -91,6 +94,7 @@
    * @param component the component
    * @param newValue the unconverted string value
    */
+  @Override
   public Object getConvertedValue(
     FacesContext context,
     UIComponent  component,
@@ -128,6 +132,7 @@
   /**
    * All editable components need IDs.
    */
+  @Override
   protected boolean shouldRenderId(
     FacesContext context,
     UIComponent  component)
@@ -138,6 +143,7 @@
   /**
    * Override to include "submitted value".
    */
+  @Override
   protected String getConvertedString(
     FacesContext context,
     UIComponent  component,
@@ -180,7 +186,7 @@
       if ( converter == null)
         converter = getDefaultConverter(context, bean);
 
-      Iterator validators = getValidators(bean);
+      Iterator<Validator> validators = getValidators(bean);
 
       if (requiredField ||
           (converter != null) ||
@@ -265,9 +271,10 @@
     return Boolean.TRUE.equals(o);
   }
 
-  protected Iterator getValidators(FacesBean bean)
+  @SuppressWarnings("unchecked")
+  protected Iterator<Validator> getValidators(FacesBean bean)
   {
-    return bean.entries(_validatorsKey);
+    return (Iterator<Validator>)bean.entries(_validatorsKey);
   }
 
   private PropertyKey _submittedValueKey;



Mime
View raw message