incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r430818 [6/9] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ trinidad-api/src/test/java/org/apache/myfaces/trinida...
Date Fri, 11 Aug 2006 16:25:11 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormSelectRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormSelectRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormSelectRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormSelectRenderer.java Fri Aug 11 09:24:50 2006
@@ -27,6 +27,7 @@
  */
 abstract public class FormSelectRenderer extends OptionContainerRenderer
 {
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -44,6 +45,7 @@
   /**
    * Renders event handlers for the node.
    */
+  @Override
   protected void renderEventHandlers(
     UIXRenderingContext context,
     UINode           node
@@ -58,7 +60,7 @@
     renderAttribute(context, "onfocus", getOnFocus(context, node));
   }
 
-
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -67,6 +69,7 @@
     return SELECT_ELEMENT;
   }
 
+  @Override
   protected final Renderer getOptionRenderer(UIXRenderingContext context)
   {
     return context.getRendererManager().getRenderer(MARLIN_NAMESPACE, 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java Fri Aug 11 09:24:50 2006
@@ -17,8 +17,6 @@
 
 import java.io.IOException;
 
-import java.util.List;
-import java.util.Set;
 
 import javax.faces.context.ResponseWriter;
 
@@ -26,8 +24,6 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
 import org.apache.myfaces.trinidadinternal.ui.NodeRole;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -49,6 +45,7 @@
     return _FORM_VALUE_ROLE;
   }
 
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -78,6 +75,7 @@
     }
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameBorderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameBorderLayoutRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameBorderLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameBorderLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -35,6 +35,7 @@
  */
 public class FrameBorderLayoutRenderer extends XhtmlLafRenderer
 {
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -88,6 +89,7 @@
     }
   }
 
+  @Override
   public boolean isSupportedNode(
     UIXRenderingContext context,
     UINode           node
@@ -119,6 +121,7 @@
   }
     */
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -138,6 +141,7 @@
    * overwrites the superclass method so that no children are written except
    * for the named ones.
    */
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -264,6 +268,7 @@
     }
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameRenderer.java Fri Aug 11 09:24:50 2006
@@ -32,6 +32,7 @@
  */
 public class FrameRenderer extends XhtmlLafRenderer
 {
+  @Override
   public boolean isSupportedNode(
     UIXRenderingContext context,
     UINode           node
@@ -41,6 +42,7 @@
     return supportsFrames(context);
   }
 
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -70,7 +72,7 @@
 						  null);
   }
 
-
+  @Override
   public void render(
     UIXRenderingContext context,
     UINode           node
@@ -92,6 +94,7 @@
     }
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -104,6 +107,7 @@
   /**
    * Override to return the id and then anme, in that order
    */
+  @Override
   protected Object getID(
     UIXRenderingContext context,
     UINode           node
@@ -116,6 +120,7 @@
   /**
    * Override to render both the id and the name
    */
+  @Override
   protected void renderID(
     UIXRenderingContext context,
     UINode           node
@@ -124,6 +129,7 @@
     renderNameAndID(context, node);
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java Fri Aug 11 09:24:50 2006
@@ -32,6 +32,7 @@
  */
 public class GlobalButtonBarRenderer extends RowLayoutRenderer
 {
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -73,6 +74,7 @@
                                          ((UIXNavigationLevel)component).getFocusRowKey());
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -156,6 +158,7 @@
     }
   }
 
+ @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -166,6 +169,7 @@
     CommandNavigationItemRenderer.setNavigationItemRendererType(context, null);
   }
 
+ @Override
   protected void renderBetweenIndexedChildren(
     UIXRenderingContext context,
     UINode           node
@@ -182,6 +186,7 @@
     renderChild(context, _SPACER);
   }
 
+  @Override
   protected void renderDefaultCellAttributes(
     UIXRenderingContext context,
     UINode           child) throws IOException
@@ -201,6 +206,7 @@
   /**
    * Renders attributes of the current node.
    */
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -230,6 +236,7 @@
    * @return true if the ancestor node is a table
    * (tableLayout or messageComponentLayout)
    */
+  @Override
   protected boolean hasTableParent(UIXRenderingContext context)
   {
     UINode ancestor = NodeRoleUtils.getStructuralAncestor(context);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.java Fri Aug 11 09:24:50 2006
@@ -77,9 +77,9 @@
   {
     setRenderingProperty( context,
                           _HEADER_SIZE,
-                          (Integer)context.getLocalProperty( 0,
-                                                            _PREV_HEADER_SIZE,
-                                                            ZERO));
+                          context.getLocalProperty(0,
+                                                   _PREV_HEADER_SIZE,
+                                                   ZERO));
   }
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.java Fri Aug 11 09:24:50 2006
@@ -51,6 +51,7 @@
     return XhtmlLafConstants.DOCUMENT_ROLE;
   }
 
+  @Override
   public void prerender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -81,6 +82,7 @@
     renderNamedChild(context, node, UIConstants.META_CONTAINER_CHILD);
   }
 
+  @Override
   public void postrender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -158,7 +160,7 @@
     }
   }
 
-
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -195,6 +197,7 @@
     return false;
   }
 
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconArrayLafIconProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconArrayLafIconProvider.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconArrayLafIconProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconArrayLafIconProvider.java Fri Aug 11 09:24:50 2006
@@ -16,6 +16,8 @@
 package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
 
 import java.awt.Color;
+
+import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeel;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.Icon;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.IconKey;
 
@@ -138,6 +140,7 @@
   /**
    * Returns the URI to the icon indentified by the icon key
    */
+  @Override
   public String getIconURI(
     UIXRenderingContext context,
     IconKey          iconKey
@@ -150,6 +153,7 @@
   /**
    * Returns the icon, given its key.
    */
+  @Override
   protected Icon getIcon(
     IconKey iconKey
     )
@@ -159,16 +163,16 @@
     return icon;
   }
 
-  
+  @Override
   protected ImageProviderRequest
     createCoreIconRequest(
-      ImageContext context, 
-      String       source,
-      Class        lookAndFeel,
-      int          direction,
-      Color        color,
-      Color        surroundingColor,
-      NameResolver resolver
+      ImageContext       context, 
+      String             source,
+      Class<LookAndFeel> lookAndFeel,
+      int                direction,
+      Color              color,
+      Color              surroundingColor,
+      NameResolver       resolver
       )
   {
     return new CoreIconRequest(context,
@@ -180,15 +184,16 @@
                                resolver);
   }
 
+  @Override
   protected ImageProviderRequest
     createAccentIconRequest(
-      ImageContext context, 
-      String       source,
-      Class        lookAndFeel,
-      int          direction,
-      Color        color,
-      Color        surroundingColor,
-      NameResolver resolver
+      ImageContext       context, 
+      String             source,
+      Class<LookAndFeel> lookAndFeel,
+      int                direction,
+      Color              color,
+      Color              surroundingColor,
+      NameResolver       resolver
       )
   {
     return new AccentIconRequest(context,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.java Fri Aug 11 09:24:50 2006
@@ -33,6 +33,7 @@
  */
 public class IconKeyRenderer extends XhtmlLafRenderer
 {
+  @Override
   protected void renderContent(UIXRenderingContext context, UINode node)
     throws IOException
   {
@@ -52,6 +53,7 @@
     }
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -60,6 +62,7 @@
     return "span";
   }
 
+  @Override
   protected Object getStyleClass(
     UIXRenderingContext context,
     UINode           node)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java Fri Aug 11 09:24:50 2006
@@ -105,11 +105,11 @@
    * @return Map containing IconConstants as keys, and the values from 
    *             the node.
    */
-  private Map _getNodeAttributeMap(
+  private Map<String, Object> _getNodeAttributeMap(
     UIXRenderingContext context,
     UINode           node)
   {
-    Map attrs = null;
+    Map<String, Object> attrs = null;
 
     Object id         = node.getAttributeValue(context, 
                                                UIConstants.ID_ATTR);
@@ -120,7 +120,7 @@
     Object embedded   = node.getAttributeValue(context, 
                                                UIConstants.EMBEDDED_ATTR);
     
-    attrs = new ArrayMap(4);
+    attrs = new ArrayMap<String, Object>(4);
     attrs.put(Icon.ID_KEY, id);
     attrs.put(Icon.SHORT_DESC_KEY, shortDesc);
     attrs.put(Icon.STYLE_CLASS_KEY, styleClass);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.java Fri Aug 11 09:24:50 2006
@@ -34,6 +34,7 @@
  */
 public class ImageRenderer extends XhtmlLafRenderer
 {
+  @Override
   protected void renderID(
     UIXRenderingContext context,
     UINode           node
@@ -59,7 +60,7 @@
     return node.getAttributeValue(context, LONG_DESC_URL_ATTR);
   }
 
-
+  @Override
   protected Object getText(
     UIXRenderingContext context,
     UINode           node
@@ -97,6 +98,7 @@
     return destination;
   }
 
+  @Override
   protected Object getOnClick(
     UIXRenderingContext context,
     UINode           node
@@ -151,6 +153,7 @@
     return node.getAttributeValue(context, DESTINATION_ATTR);
   }
 
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -159,6 +162,7 @@
     // Don't bother with prerendering - it's all done in rendercontent
   }
 
+  @Override
   protected final void postrender(
     UIXRenderingContext context,
     UINode node
@@ -187,6 +191,7 @@
     _renderImageMap(context, node);
   }
 
+  @Override
   protected void renderHAlign(
     UIXRenderingContext context,
     UINode           node
@@ -217,6 +222,7 @@
    * we render shortDesc as alt text on image. Do not render it as title
    * on the link.
    */
+  @Override
   protected void renderShortDesc(UIXRenderingContext context,
                                  UINode node)
   {
@@ -228,6 +234,7 @@
    * we don't need to call getSource() multiple times per render, as this
    * can be a little expensive for subclasses like ButtonRenderer.
    */
+  @Override
   protected final void renderContent(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImportScriptRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImportScriptRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImportScriptRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImportScriptRenderer.java Fri Aug 11 09:24:50 2006
@@ -40,6 +40,7 @@
     return USER_INVISIBLE_ROLE;
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java Fri Aug 11 09:24:50 2006
@@ -18,7 +18,6 @@
 import java.io.IOException;
 
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
-import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java Fri Aug 11 09:24:50 2006
@@ -36,7 +36,7 @@
  */
 public class LinkRenderer extends XhtmlLafRenderer
 {
-
+  @Override
   public void render(UIXRenderingContext context,
                      UINode node) throws IOException
   {
@@ -70,6 +70,7 @@
     return rv;
   }
 
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -119,6 +120,7 @@
    * @see #setDisabled(UIXRenderingContext,boolean)
    * @todo gcrawford - for now readonly maps to disabled
    */
+  @Override
   protected boolean isDisabled(
     UIXRenderingContext context,
     UINode           node
@@ -206,6 +208,7 @@
   /**
    * Renders event handlers for the node.
    */
+  @Override
   protected void renderEventHandlers(
     UIXRenderingContext context,
     UINode           node
@@ -221,6 +224,7 @@
     }
   }
 
+  @Override
   protected void renderID(
     UIXRenderingContext context,
     UINode           node
@@ -259,6 +263,7 @@
   /**
    * Override to return the id and then anme, in that order
    */
+  @Override
   protected Object getID(
     UIXRenderingContext context,
     UINode           node
@@ -323,6 +328,7 @@
   /**
    * Returns the destination to use for the ImageRenderer.
    */
+  @Override
   protected Object getText(
     UIXRenderingContext context,
     UINode           node
@@ -343,6 +349,7 @@
   /**
    * Returns the StyleClass to use to render this node.
    */
+  @Override
   protected Object getStyleClass(
     UIXRenderingContext context,
     UINode           node
@@ -375,6 +382,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -428,6 +436,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -448,7 +457,7 @@
     super.postrender(context, node);
   }
 
-
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -479,6 +488,7 @@
     super.renderContent(context, node);
   }
 
+  @Override
   protected boolean doRenderStyleAttrs(
     UIXRenderingContext context,
     UINode           node
@@ -489,7 +499,7 @@
     return false;
   }
 
-
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -508,6 +518,7 @@
               : "span";
   }
 
+  @Override
   protected Object getOnClick(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.java Fri Aug 11 09:24:50 2006
@@ -22,6 +22,7 @@
 import javax.faces.component.UIComponent;
 
 import javax.faces.context.ResponseWriter;
+import javax.faces.model.SelectItem;
 
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
@@ -38,6 +39,7 @@
  */
 public class ListRenderer extends FormSelectRenderer
 {
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -53,7 +55,7 @@
     // Get (and cache) the list of SelectItems
     UIComponent component = OptionContainerRenderer.__getUIComponent(context,
                                                                      node);
-    List selectItems;
+    List<SelectItem> selectItems;
     if (component != null)
     {
         selectItems = 
@@ -92,6 +94,7 @@
     renderAttribute(context, SIZE_ATTRIBUTE, size);
   }
 
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -106,6 +109,8 @@
     super.prerender(context, node);
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -118,9 +123,10 @@
     UIComponent component = OptionContainerRenderer.__getUIComponent(context,
                                                                      node);
 
-    List selectItems = (List) context.getLocalProperty(0,
-                                                       _SELECT_ITEMS_PROPERTY,
-                                                       null); 
+    List<SelectItem> selectItems = 
+      (List<SelectItem>) context.getLocalProperty(0,
+                                                  _SELECT_ITEMS_PROPERTY,
+                                                  null); 
 
   
     if (component != null)
@@ -145,6 +151,7 @@
     
   }  
 
+  @Override
   protected Boolean isMultipleSelection(
     UIXRenderingContext context,
     UINode           node)
@@ -160,6 +167,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void renderBetweenIndexedChildren(
     UIXRenderingContext context,
     UINode           node
@@ -175,6 +183,7 @@
     }
   }
 
+  @Override
   protected Object getOnChange(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java Fri Aug 11 09:24:50 2006
@@ -110,6 +110,7 @@
    *         drive almost everything off of meta-data, the decision to
    *         do all of the work in render() could be revisited.
    */
+  @Override
   public void render(
     UIXRenderingContext context,
     UINode           node
@@ -563,8 +564,7 @@
       Integer agentOS = IntegerUtils.getInteger(agentOSInt);
 
       // get the set of supported players for this OS
-      HashSet supportedPlayers = (HashSet)
-                                _sSupportedOSPlayers.get(agentOS);
+      HashSet<Object> supportedPlayers = _sSupportedOSPlayers.get(agentOS);
 
       // are we trying to display an image?
       boolean isImage = "image".equals(primaryMimeType);
@@ -631,7 +631,7 @@
           if ((preferredPlayer != null) &&
               supportedPlayers.contains(preferredPlayer))
           {
-            playerData = (PlayerData)_sPlayerData.get(preferredPlayer);
+            playerData = _sPlayerData.get(preferredPlayer);
           }
         }
 
@@ -644,7 +644,7 @@
 
           if (preferredPlayer != null)
           {
-            playerData = (PlayerData)_sPlayerData.get(preferredPlayer);
+            playerData = _sPlayerData.get(preferredPlayer);
 
             // check that the format is supported by this player
             if (!((PlayerData)playerData).isSupportedMimeType(mimeType))
@@ -815,7 +815,7 @@
   /**
    * Initializes a Hashset with the contents of an array
    */
-  private static HashSet _createHashSet(
+  private static HashSet<Object> _createHashSet(
     Object[] contents
     )
   {
@@ -823,7 +823,8 @@
     {
       int contentLength = contents.length;
 
-      HashSet set = new HashSet((int)(contentLength * 1.5));
+      HashSet<Object> set = 
+        new HashSet<Object>((int)(contentLength * 1.5));
 
       for (int i = 0; i < contentLength; i++)
       {
@@ -841,7 +842,7 @@
   /**
    * Initializes a HashMap with the name/value contents of an array
    */
-  private static HashMap _createHashMap(
+  private static HashMap<Object, Object> _createHashMap(
     Object[] contents
     )
   {
@@ -849,7 +850,8 @@
     {
       int contentLength = contents.length;
 
-      HashMap map = new HashMap((int)(contentLength * 0.75));
+      HashMap<Object, Object> map = 
+        new HashMap<Object, Object>((int)(contentLength * 0.75));
 
       for (int i = 0; i < contentLength; i += 2)
       {
@@ -1370,7 +1372,7 @@
       return (ControlData)controlData;
     }
 
-    private final HashMap _controls;
+    private final HashMap<Object, Object> _controls;
   }
 
 
@@ -1502,8 +1504,8 @@
     public  final String  overrideContentType;
     public  final String  wireImageToControlsParamName;
     private final ControlData _imageWindowControlData;
-    private final HashMap _controlSets;
-    private final HashSet _unsupportedMimeTypes;
+    private final HashMap<Object, Object> _controlSets;
+    private final HashSet<Object> _unsupportedMimeTypes;
   }
 
 
@@ -2098,25 +2100,25 @@
   private static final Object _PLAYER_DATA_KEY = new Object();
 
   // map of mime types to preferred players
-  private static HashMap _sPreferredMimePlayers;
+  private static HashMap<Object, Object> _sPreferredMimePlayers;
 
   // map of Operating Systems to preferred players
-  private static HashMap _sPreferredOSPlayers;
+  private static HashMap<Integer, String> _sPreferredOSPlayers;
 
   // map of Operating Systems to HashSet of supported players
-  private static HashMap _sSupportedOSPlayers;
+  private static HashMap<Integer, HashSet<Object>> _sSupportedOSPlayers;
 
   // map the in mime type to the cannonical mime type
-  private static HashMap  _sMimeTypeRemapper;
+  private static HashMap<Object, Object>  _sMimeTypeRemapper;
 
   // maps the extension to the mime type
-  private static HashMap _sExtensionMap;
+  private static HashMap<Object, Object> _sExtensionMap;
 
   // maps a player name to its player data
-  private static HashMap _sPlayerData;
+  private static HashMap<Object, Object> _sPlayerData;
 
   // maps a primary content type to a default inner size
-  private static HashMap _sDefaultInnerSizes;
+  private static HashMap<Object, Object> _sDefaultInnerSizes;
 
   static
   {
@@ -2133,12 +2135,12 @@
     int supportedOSPlayersLength = _SUPPORTED_OS_PLAYERS.length;
     int hashSize = (int)(supportedOSPlayersLength * 0.75);
 
-    _sSupportedOSPlayers = new HashMap(hashSize);
-    _sPreferredOSPlayers = new HashMap(hashSize);
+    _sSupportedOSPlayers = new HashMap<Integer, HashSet<Object>>(hashSize);
+    _sPreferredOSPlayers = new HashMap<Integer, String>(hashSize);
 
     for (int i = 0; i < supportedOSPlayersLength; i += 2)
     {
-      Object   os      = _SUPPORTED_OS_PLAYERS[i];
+      Integer  os      = (Integer)_SUPPORTED_OS_PLAYERS[i];
       Object[] players = (Object[])_SUPPORTED_OS_PLAYERS[i + 1];
 
       if ((players != null) && (players.length > 0))
@@ -2148,7 +2150,7 @@
         _sSupportedOSPlayers.put(os, _createHashSet(players));
 
         // record the preferred player for this OS
-        _sPreferredOSPlayers.put(os, players[0]);
+        _sPreferredOSPlayers.put(os, (String)players[0]);
       }
     }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ModelRendererUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ModelRendererUtils.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ModelRendererUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ModelRendererUtils.java Fri Aug 11 09:24:50 2006
@@ -60,8 +60,8 @@
     
     if (focusRowKey != null )  
     {
-      List focusPath = component.getAllAncestorContainerRowKeys(focusRowKey);
-      focusPath = new ArrayList(focusPath);
+      List<Object> focusPath = component.getAllAncestorContainerRowKeys(focusRowKey);
+      focusPath = new ArrayList<Object>(focusPath);
       focusPath.add(focusRowKey);
       
       int focusSize =  focusPath.size();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Fri Aug 11 09:24:50 2006
@@ -94,6 +94,7 @@
   //         at render-time. This is a _temporary_ solution, until we
   //         decide how to create anonymous children for UINodes that
   //         can persist across renderings.
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -146,6 +147,7 @@
 
   }
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -154,7 +156,7 @@
     // do nothing
   }
 
-
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -1440,8 +1442,8 @@
     boolean maxUnknown = (maxValue == MAX_VALUE_UNKNOWN);
 
     // Zero-indexed block index.
-    long blockIndex = (value - minValue + ((long) blockSize) - 1L) /
-                         (long) blockSize;
+    long blockIndex = (value - minValue + blockSize - 1L) /
+                         blockSize;
 
     // sometimes a record set won't start on a multiple of blockSize. So
     // remember to add any offset:
@@ -1457,8 +1459,7 @@
       maxBlockIndex = blockIndex + 1;
     else
     {
-      maxBlockIndex = (maxValue - minValue - offset) /
-                           ((long) blockSize);
+      maxBlockIndex = (maxValue - minValue - offset) / blockSize;
       if (offset > 0)
         maxBlockIndex++;
     }
@@ -1511,7 +1512,7 @@
          blockIndex <= lastBlockIndex;
          blockIndex++)
     {
-      long blockStart = minValue + (blockIndex * ((long) blockSize));
+      long blockStart = minValue + (blockIndex * blockSize);
 
       // if there is an offset, then adjust accordingly. for example, if the
       // offset is 7 (and the blockSize is 10), then the new blockStarts are:

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java Fri Aug 11 09:24:50 2006
@@ -45,6 +45,7 @@
  */
 public class NavigationPathRenderer extends XhtmlLafRenderer
 {
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -56,7 +57,7 @@
     return SPAN_ELEMENT;
   }
 
-
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -100,6 +101,7 @@
     setRenderingProperty(context, _BETWEEN_RENDERER_KEY, between);
   }
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -128,6 +130,8 @@
 
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -148,11 +152,11 @@
     // properly, so be sure to set the path to the value you want after the
     // call to getFocusPath.
     component.setRowKey(null);
-    List focusPath = Collections.EMPTY_LIST;
+    List<Object> focusPath = Collections.EMPTY_LIST;
     if (focusRowKey != null)
     {
       focusPath = component.getAllAncestorContainerRowKeys(focusRowKey);
-      focusPath = new ArrayList(focusPath);
+      focusPath = new ArrayList<Object>(focusPath);
       focusPath.add(focusRowKey);
     }
 
@@ -220,7 +224,7 @@
       // the last link.
       return;
     }
-    Map originalResourceKeyMap = context.getSkinResourceKeyMap();
+    Map<String, String> originalResourceKeyMap = context.getSkinResourceKeyMap();
     try
     {
       context.setSkinResourceKeyMap(_RESOURCE_KEY_MAP);
@@ -288,6 +292,7 @@
     return false;
   }
 
+  @Override
   protected Object getStyleClass(
     UIXRenderingContext context,
     UINode           node
@@ -445,9 +450,11 @@
 
   static private final Object _IS_LAST_CHILD_KEY = new Object();
   static private final Object _BETWEEN_RENDERER_KEY = new Object();
-  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(
       XhtmlLafConstants.LINK_STYLE_CLASS,
       XhtmlLafConstants.AF_NAVIGATION_PATH_STEP_STYLE_CLASS);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java Fri Aug 11 09:24:50 2006
@@ -42,14 +42,13 @@
 import org.apache.myfaces.trinidadinternal.ui.state.BaseSelection;
 import org.apache.myfaces.trinidadinternal.ui.state.Selection;
 
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
-
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/base/xhtml/OptionContainerRenderer.java#0 $) $Date: 10-nov-2005.18:54:04 $
  * @author The Oracle ADF Faces Team
  */
 abstract public class OptionContainerRenderer extends FormElementRenderer
 {
+  @Override
   protected void renderAsNonElement(UIXRenderingContext context, UINode node)
     throws IOException
   {
@@ -61,6 +60,7 @@
     popRenderingProperty(context, _OPTION_INFO_PROPERTY);
   }
 
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -88,6 +88,7 @@
     pushRenderingProperty(context, _OPTION_INFO_PROPERTY, info);
   }
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -100,6 +101,7 @@
   /**
    * Renders event handlers for the node.
    */
+  @Override
   protected void renderEventHandlers(
     UIXRenderingContext context,
     UINode           node
@@ -205,13 +207,13 @@
     UIXRenderingContext context,
     UINode           node,
     UIComponent      component,
-    List             items) throws IOException
+    List<SelectItem> items) throws IOException
   {
     if ((items == null) || items.isEmpty())
       return;
 
     Converter converter = ((ValueHolder) component).getConverter();
-    List selectedValues = null;
+    List<Object> selectedValues = null;
     boolean isSubmitted = false;
 
     // First, look in "submitted values" - assume it's
@@ -228,7 +230,7 @@
         }
         else
         {
-          selectedValues = new ArrayList(1);
+          selectedValues = new ArrayList<Object>(1);
           selectedValues.add(submittedValue);
         }
 
@@ -259,7 +261,7 @@
     int size = items.size();    
     for (int i = 0; i < size; i++)
     {
-      SelectItem item = (SelectItem) items.get(i);
+      SelectItem item = items.get(i);
 
       Object valueObj = null;
       // if item is null, then this most likely means that rendered="false".
@@ -395,7 +397,8 @@
     return component;
   }
 
-  static private List _getSelectedValues(UIComponent component)
+  @SuppressWarnings("unchecked")
+  static private List<Object> _getSelectedValues(UIComponent component)
   {
     // Assume the component is a value holder
     Object value = ((ValueHolder) component).getValue();
@@ -403,7 +406,7 @@
       return null;
 
     if (value instanceof List)
-      return (List) value;
+      return (List<Object>) value;
 
     // Object array
     if (value instanceof Object[])
@@ -414,14 +417,14 @@
     if (value.getClass().isArray())
     {
       int length = Array.getLength(value);
-      List list = new ArrayList(length);
+      List<Object> list = new ArrayList<Object>(length);
       for (int i = 0; i < length; i++)
         list.add(Array.get(value, i));
       return list;
     }
 
     // Single object
-    ArrayList list = new ArrayList(1);
+    ArrayList<Object> list = new ArrayList<Object>(1);
     list.add(value);
     return list;
   }
@@ -443,6 +446,7 @@
                                                _OPTION_INFO_PROPERTY);
     }
 
+    @Override
     protected void renderAttributes(
       UIXRenderingContext context,
       UINode           node
@@ -529,6 +533,7 @@
       }
     }
 
+    @Override
     protected Object getNodeName(
       UIXRenderingContext context,
       UINode           node
@@ -538,6 +543,7 @@
       return info.name;
     }
 
+    @Override
     protected Object getTransformedName(
       UIXRenderingContext context,
       UINode           node
@@ -573,6 +579,7 @@
       return info.readOnly;
     }
 
+    @Override
     protected Object getStyleClass(
       UIXRenderingContext context,
       UINode           node
@@ -585,6 +592,7 @@
     /**
      * Returns the value associated with the text attribute
      */
+    @Override
     protected Object getText(
       UIXRenderingContext context,
       UINode  node)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.java Fri Aug 11 09:24:50 2006
@@ -26,6 +26,7 @@
  */
 public class OptionRenderer extends OptionContainerRenderer.OptionRenderer
 {
+  @Override
   public void render(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageButtonBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageButtonBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageButtonBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageButtonBarRenderer.java Fri Aug 11 09:24:50 2006
@@ -29,6 +29,7 @@
  */
 public class PageButtonBarRenderer extends GlobalButtonBarRenderer
 {
+  @Override
   protected UIXHierarchy getHierarchyBase(
     UIXRenderingContext context,
     UINode           node
@@ -37,6 +38,7 @@
     return null;
   }
 
+  @Override
   protected void renderDefaultCellAttributes(
     UIXRenderingContext context,
     UINode           child
@@ -44,6 +46,7 @@
   {
   }
 
+  @Override
   protected boolean renderCellElement(
     UIXRenderingContext context,
     UINode           child
@@ -53,15 +56,17 @@
             !isEqualMarlinName(child, NAVIGATION_BAR_NAME));
   }
   
+  @Override
   protected String mapKey(String key)
   {
-    return (String)_RESOURCE_KEY_MAP.get(key);
+    return _RESOURCE_KEY_MAP.get(key);
   }
  
-  private static final Map _RESOURCE_KEY_MAP  =  new HashMap();
+  private static final Map<String, String> _RESOURCE_KEY_MAP;
   static  
   {
-
+    _RESOURCE_KEY_MAP = new HashMap<String, String>();
+    
     _RESOURCE_KEY_MAP.put("af_menuButtons.BLOCK_TITLE", 
                           "af_panelButtonBar.BLOCK_TITLE");
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageMenuButtonsRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageMenuButtonsRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageMenuButtonsRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageMenuButtonsRenderer.java Fri Aug 11 09:24:50 2006
@@ -17,7 +17,6 @@
 
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXPage;
-import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem;
 
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -28,6 +27,7 @@
  */
 public class PageMenuButtonsRenderer extends GlobalButtonBarRenderer
 {
+  @Override
   protected UIXHierarchy getHierarchyBase(
     UIXRenderingContext context,
     UINode           node
@@ -37,6 +37,7 @@
     return (UIXPage) pageNode.getUIComponent();
   }
 
+  @Override
   protected UINode getStamp(
     UIXRenderingContext context,
     UINode           node
@@ -46,6 +47,7 @@
     return getNamedChild(context, pageNode, NODE_STAMP_CHILD);
   }
 
+  @Override
   protected boolean setNewPath(
     UIXRenderingContext context,
     UINode           node,
@@ -53,6 +55,6 @@
   )
   {
     int startDepth = getIntAttributeValue(context, node, LEVEL_ATTR, 0);
-    return PageRendererUtils.setNewPath(context, ((UIXPage)component), startDepth);
+    return PageRendererUtils.setNewPath(context, component, startDepth);
   }
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.java Fri Aug 11 09:24:50 2006
@@ -29,8 +29,7 @@
  */
 public class PageNavigationPathRenderer extends BreadCrumbsRenderer
 {
-
-
+  @Override
   protected UIXHierarchy getHierarchyBase(
     UIXRenderingContext context, 
     UINode           node
@@ -40,6 +39,7 @@
     return (UIXPage) pageNode.getUIComponent();   
   }
 
+  @Override
   protected UINode getStamp(
     UIXRenderingContext context,
     UINode           node
@@ -49,6 +49,7 @@
     return getNamedChild(context, pageNode, NODE_STAMP_CHILD);
   }
   
+  @Override
   protected Object getFocusPath(
     UIXHierarchy    component
     )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java Fri Aug 11 09:24:50 2006
@@ -46,6 +46,7 @@
  */
 public class PageRenderer extends UINodeRenderer
 {
+  @Override
   protected UINode getRenderingUINode(
     UIXRenderingContext context,
     UINode           node)
@@ -53,7 +54,7 @@
     return _compositeNode;
   }
 
-
+  @Override
   protected void renderWithNode(
     UIXRenderingContext context,
     UINode           node,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java Fri Aug 11 09:24:50 2006
@@ -76,6 +76,7 @@
 
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -103,7 +104,7 @@
     super.renderContent(context, node);
   }
 
-
+  @Override
   protected void selectItemsRenderContent(
     UIXRenderingContext context,
     UINode           node
@@ -116,6 +117,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -414,6 +416,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -466,6 +469,7 @@
 
   }
 
+  @Override
   protected Object getOnChange(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java Fri Aug 11 09:24:50 2006
@@ -435,11 +435,13 @@
       return _sInstance;
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _NAV_SUBMIT_SCRIPTLET;
     }
 
+    @Override
     protected void outputScriptletContent(
       FacesContext context,
       RenderingContext arc) throws IOException
@@ -471,11 +473,13 @@
       return _sInstance;
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _NAV_CHOICE_SUBMIT_SCRIPTLET;
     }
 
+    @Override
     protected void outputScriptletContent(
       FacesContext context,
       RenderingContext arc) throws IOException

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.java Fri Aug 11 09:24:50 2006
@@ -51,6 +51,7 @@
    * @param node
    * @throws IOException
    */
+  @Override
   public void render(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ResetButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ResetButtonRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ResetButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ResetButtonRenderer.java Fri Aug 11 09:24:50 2006
@@ -33,7 +33,7 @@
  */
 public class ResetButtonRenderer extends ButtonRenderer
 {
-
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -47,6 +47,7 @@
    * Returns true if button tags are being used.  Provides a hook for
    * subclassers to override
    */
+  @Override
   protected boolean useButtonTags(
     UIXRenderingContext context
     )
@@ -58,6 +59,7 @@
   /**
    * Override to change the type of the button
    */
+  @Override
   protected String getButtonType()
   {
     return "reset";
@@ -69,6 +71,7 @@
    * =-= bts copied code from
    *         org.apache.myfaces.trinidadinternal.ui.blaf.RestButtonRenderer
    */
+  @Override
   protected Object getOnClick(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RowLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RowLayoutRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RowLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RowLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -29,6 +29,7 @@
  */
 public class RowLayoutRenderer extends XhtmlLafRenderer
 {
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -42,6 +43,7 @@
     }
   }
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -55,6 +57,7 @@
   /**
    * Renders attributes of the current node.
    */
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -83,6 +86,7 @@
    * @param context the rendering context
    * @param child the child under consideration
    */
+  @Override
   protected void renderChild(
     UIXRenderingContext context,
     UINode           child
@@ -120,6 +124,7 @@
     return !isEqualMarlinName(child, CELL_FORMAT_NAME);
   }
 
+  @Override
   protected void renderBetweenIndexedChildren(
     UIXRenderingContext context,
     UINode           node
@@ -128,6 +133,7 @@
     renderNamedChild(context, node, SEPARATOR_CHILD);
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java Fri Aug 11 09:24:50 2006
@@ -44,6 +44,7 @@
     return USER_INVISIBLE_ROLE;
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -52,6 +53,7 @@
     return (_hasText(context, node)) ? "script" : null;
   }
 
+  @Override
   public void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -86,6 +88,7 @@
       context.getResponseWriter().writeText(text, null);
   }
 
+  @Override
   public void postrender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -93,7 +96,7 @@
     super.postrender(context, node);
   }
 
-    
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,6 +31,7 @@
 public class SelectOptionRenderer
        extends OptionContainerRenderer.OptionRenderer
 {
+  @Override
   public void render(
     UIXRenderingContext context,
     UINode           node
@@ -89,6 +90,7 @@
     }
   }
 
+  @Override
   protected boolean doRenderStyleAttrs(
     UIXRenderingContext context,
     UINode           node
@@ -97,6 +99,7 @@
     return false;
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -104,6 +107,7 @@
     renderText(context, node);
   }
 
+  @Override
   protected void renderSelectedAttribute(
     UIXRenderingContext context,
     UINode           node
@@ -114,6 +118,7 @@
                     Boolean.valueOf(isOptionSelected(context, node)));
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SeparatorRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SeparatorRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SeparatorRenderer.java Fri Aug 11 09:24:50 2006
@@ -28,6 +28,7 @@
  */
 public class SeparatorRenderer extends XhtmlLafRenderer
 {
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -36,6 +37,7 @@
     // no children rendered
   }
   
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ShowItemRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ShowItemRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ShowItemRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ShowItemRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,7 +31,7 @@
  */
 public class ShowItemRenderer extends LinkRenderer 
 {
-
+  @Override
   protected void renderIndexedChild(
     UIXRenderingContext context,
     UINode           node,
@@ -46,6 +46,7 @@
   }
   
   // Returns the partial change script that is usually rendered for onClick
+  @Override
   protected String getPartialChangeScript(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SpacerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SpacerRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SpacerRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SpacerRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,6 +31,7 @@
  */
 public class SpacerRenderer extends XhtmlLafRenderer
 {
+  @Override
   public void render(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -29,6 +29,7 @@
  */
 public class StackLayoutRenderer extends XhtmlLafRenderer
 {  
+  @Override
   protected void renderBetweenIndexedChildren(
     UIXRenderingContext context,
     UINode           node,
@@ -60,7 +61,7 @@
     }
   }
 
-
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java Fri Aug 11 09:24:50 2006
@@ -37,7 +37,7 @@
  */
 public class StyledTextRenderer extends XhtmlLafRenderer
 {
-
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -140,6 +140,7 @@
    * Actually renders the style attributes.
    * @see #doRenderStyleAttrs
    */
+  @Override
   protected void renderStyleAttrs(
     UIXRenderingContext context,
     UINode           node
@@ -180,6 +181,7 @@
     return getStyleClass(context, node);
   }
 
+  @Override
   protected Object getText(
     UIXRenderingContext context,
     UINode           node
@@ -190,7 +192,7 @@
                                                TEXT_ATTR);
   }
 
-
+  @Override
   protected boolean doRenderStyleAttrs(
     UIXRenderingContext context,
     UINode           node
@@ -210,7 +212,7 @@
                                            LABELED_NODE_ID_ATTR);
   }
 
-
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java Fri Aug 11 09:24:50 2006
@@ -34,6 +34,7 @@
  */
 public class SubmitButtonRenderer extends ResetButtonRenderer
 {
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -59,6 +60,7 @@
   /**
    * Override to change the type of the button
    */
+  @Override
   protected String getButtonType()
   {
     return "submit";
@@ -227,6 +229,7 @@
   /**
    * Returns the Javascript function call to return for this button.
    */
+  @Override
   protected String getFunctionCall(
     UIXRenderingContext context,
     UINode           node,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -32,6 +32,7 @@
   /**
    * Renders attributes of the current node.
    */
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -76,6 +77,7 @@
     }
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java Fri Aug 11 09:24:50 2006
@@ -42,14 +42,14 @@
  */
 public class TextInputRenderer extends FormInputRenderer
 {
-
+  @Override
   protected void renderAsNonElement(
     UIXRenderingContext context, UINode node) throws IOException
   {
     renderContent(context, node, false);
   }
 
-
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -213,6 +213,7 @@
   /**
    * Renders event handlers for the node.
    */
+  @Override
   protected void renderEventHandlers(
     UIXRenderingContext context,
     UINode           node
@@ -229,6 +230,7 @@
    * Get the name for a node. In rare cases, the renderer must specify
    * the name.
    */
+  @Override
   protected Object getNodeName(
     UIXRenderingContext context,
     UINode           node
@@ -248,6 +250,7 @@
               : super.getNodeName(context, node);
   }
 
+  @Override
   protected Object getOnKeyPress(
     UIXRenderingContext context,
     UINode           node
@@ -332,6 +335,7 @@
   /**
    * Override to write any client JavaScript dependencies for the validater.
    */
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -369,7 +373,7 @@
     }
   }
 
-
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -466,6 +470,7 @@
     }
   }
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -561,6 +566,7 @@
     return node.getAttributeValue(context, COLUMNS_ATTR);
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -571,7 +577,7 @@
              : INPUT_ELEMENT;
   }
 
-
+  @Override
   protected Object getDefaultStyleClass(
     UIXRenderingContext context,
     UINode           node
@@ -582,7 +588,7 @@
              : AF_FIELD_TEXT_STYLE_CLASS;
   }
 
-
+  @Override
   protected Object getDefaultDisabledStyleClass(
     UIXRenderingContext context,
     UINode           node
@@ -630,6 +636,7 @@
     return false;
   }
 
+  @Override
   protected boolean renderReadOnlyAsElement(
     UIXRenderingContext context,
     UINode           node)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java Fri Aug 11 09:24:50 2006
@@ -42,6 +42,7 @@
     this(context, 0, baseid);
   }
 
+  @SuppressWarnings("unchecked")
   public UniqueCompositeId(UIXRenderingContext context,
                            int    depth,
                            String baseid)
@@ -74,15 +75,15 @@
       // build a new ID by the usual method, and tacking on the count
       // then we save it locally so it gets returned next time we ask for it
       // at this level.
-      Hashtable countHash =
-        (Hashtable) context.getProperty(UIConstants.MARLIN_NAMESPACE,
-                                        _EXT_KEY);
+      Hashtable<String, Integer> countHash =
+        (Hashtable<String, Integer>) context.getProperty(UIConstants.MARLIN_NAMESPACE,
+                                                         _EXT_KEY);
       if (countHash == null)
       {
-        countHash = new Hashtable();
+        countHash = new Hashtable<String, Integer>();
       }
 
-      Integer globalCount = (Integer) countHash.get(baseid);
+      Integer globalCount = countHash.get(baseid);
       int newCount;
 
       if (globalCount == null)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlFormattedText.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlFormattedText.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlFormattedText.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlFormattedText.java Fri Aug 11 09:24:50 2006
@@ -54,20 +54,25 @@
       super(name, empty, closeRequired);
     }
     
+    @Override
     public void writeInlineStyle(FacesContext context, String style)
     {
 
     }
 
+    @Override
     public void writeStyleClass(FacesContext context, String styleClass)
     {
 
     }
+    
+    @Override
     public void writeHRef(FacesContext context, String href)
     {
     
     }  
 
+    @Override
     public void writeSize(FacesContext context, String fontSize)
       throws IOException
     {
@@ -88,6 +93,7 @@
       super(name, empty, closeRequired);
     }
 
+    @Override
     public void writeInlineStyle(FacesContext context, String style)
       throws IOException
     {
@@ -101,6 +107,7 @@
       }*/
     }
 
+    @Override
     public void writeStyleClass(FacesContext context, String styleClass)
       throws IOException
     {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java Fri Aug 11 09:24:50 2006
@@ -23,6 +23,8 @@
 import javax.faces.context.ResponseWriter;
 
 import javax.faces.convert.Converter;
+import javax.faces.validator.Validator;
+
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -67,6 +69,7 @@
    * Override to handle case where this element isn't in a supported module
    * of the current user agent
    */
+  @Override
   public void render(
     UIXRenderingContext context,
     UINode           node
@@ -185,6 +188,7 @@
   /**
    * Override to add support for rendering syle elements
    */
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -216,6 +220,7 @@
   /**
    * Override to add support for rendering syle elements
    */
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -264,7 +269,7 @@
     }
   }
 
-
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -2031,6 +2036,7 @@
     }
   }
 
+  @SuppressWarnings("unchecked")
   protected void addOnSubmitConverterValidators(
     UIXRenderingContext context,
     UINode           node,
@@ -2050,8 +2056,9 @@
                            node.getAttributeValue(context, REQUIRED_ATTR));
       Converter converter = (Converter)node.getAttributeValue(context,
                                                   UIConstants.CONVERTER_ATTR);
-      Iterator validators = (Iterator) node.getAttributeValue(context,
-                                                   UIConstants.VALIDATORS_ATTR);
+      Iterator<Validator> validators = 
+        (Iterator<Validator>) node.getAttributeValue(context,
+                                                     UIConstants.VALIDATORS_ATTR);
       if (requiredField ||
           (converter != null) ||
           ((validators != null) && validators.hasNext()))

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Fri Aug 11 09:24:50 2006
@@ -105,7 +105,7 @@
   public static String encodeJSEventObject(
     UIXRenderingContext context,
     String           formName,
-    Iterator      keyValues,
+    Iterator<Object> keyValues,
     int              keyValueSize
     )
   {
@@ -367,7 +367,7 @@
   {
     if (verticalAlign != null)
     {
-      return (String)_sSupportedVAligns.get(verticalAlign);
+      return _sSupportedVAligns.get(verticalAlign);
     }
     else
     {
@@ -379,17 +379,18 @@
   /**
    * Closes any tags started by startRenderingStyleElements
    */
+  @SuppressWarnings("unchecked")
   public static void endRenderingStyleElements(
     UIXRenderingContext context
     ) throws IOException
   {
     Stack[] styleInfo = _getStyleInfo(context);
 
-    Stack styleFlagsStack = styleInfo[_STACK_FLAGS_INDEX];
+    Stack<Integer> styleFlagsStack = styleInfo[_STACK_FLAGS_INDEX];
 
     // get the flags of the elements started, popping the
     // current styleFlags
-    int styleFlags = ((Integer)styleFlagsStack.pop()).intValue();
+    int styleFlags = styleFlagsStack.pop().intValue();
     if (styleFlags != 0)
     {
       ResponseWriter writer = context.getResponseWriter();
@@ -590,8 +591,8 @@
     }
 
     // push the flags of the styles actually written
-    _getStyleInfoStack(styleInfo, _STACK_FLAGS_INDEX).push(
-                                    IntegerUtils.getInteger(flags));
+    Stack<Object> stackInfo = _getStyleInfoStack(styleInfo, _STACK_FLAGS_INDEX);
+    stackInfo.push(IntegerUtils.getInteger(flags));
   }
 
 
@@ -1185,6 +1186,7 @@
    * and to add a generic mechanism for tracking the rendering traversal
    * which provides access to the current RenderingContext.
    */
+  @SuppressWarnings("unchecked")
   static void __pushCurrentRenderingContext(
     UIXRenderingContext context
     )
@@ -1200,11 +1202,12 @@
     // But I don't think performance is going to be an issue -
     // so let's just make sure this code is safe...
 
-    Stack stack = (Stack)context.getProperty(MARLIN_NAMESPACE,
-                                   _CURRENT_RENDERING_CONTEXT_PROPERTY);
+    Stack<UIXRenderingContext> stack = 
+      (Stack<UIXRenderingContext>)context.getProperty(MARLIN_NAMESPACE,
+                                                      _CURRENT_RENDERING_CONTEXT_PROPERTY);
     if (stack == null)
     {
-      stack = new Stack();
+      stack = new Stack<UIXRenderingContext>();
       context.setProperty(MARLIN_NAMESPACE,
                           _CURRENT_RENDERING_CONTEXT_PROPERTY,
                           stack);
@@ -1217,12 +1220,14 @@
    * Reverses the last call to __pushCurrentRenderingContext()
    * by popping the current RenderingContext off of the stack.
    */
+  @SuppressWarnings("unchecked")
   static void __popCurrentRenderingContext(
     UIXRenderingContext context
     )
   {
-    Stack stack = (Stack)context.getProperty(MARLIN_NAMESPACE,
-                                   _CURRENT_RENDERING_CONTEXT_PROPERTY);
+    Stack<UIXRenderingContext> stack = 
+      (Stack<UIXRenderingContext>)context.getProperty(MARLIN_NAMESPACE,
+                                                      _CURRENT_RENDERING_CONTEXT_PROPERTY);
 
     // Null stack here is a programmer error...
     assert (stack != null);
@@ -1234,22 +1239,25 @@
    * Retrieves the current RenderingContext as specified
    * by the last call to __pushCurrentRenderingContext().
    */
+  @SuppressWarnings("unchecked")
   static UIXRenderingContext __getCurrentRenderingContext(
     UIXRenderingContext context
     )
   {
-    Stack stack = (Stack)context.getProperty(MARLIN_NAMESPACE,
-                                   _CURRENT_RENDERING_CONTEXT_PROPERTY);
+    Stack<UIXRenderingContext> stack = 
+      (Stack<UIXRenderingContext>)context.getProperty(MARLIN_NAMESPACE,
+                                                      _CURRENT_RENDERING_CONTEXT_PROPERTY);
 
     if ((stack == null) || (stack.empty()))
       return null;
 
-    return (UIXRenderingContext)stack.peek();
+    return stack.peek();
   }
 
 
   // maps fonts size names to font element size strings
-  static private HashMap _sSizeNameMap = new HashMap(13);
+  static private HashMap<String, String> _sSizeNameMap = 
+    new HashMap<String, String>(13);
 
   //
   // mapping of size names to font element size strings
@@ -1321,7 +1329,7 @@
   {
     if (value != null)
     {
-      Stack styleInfoStack = _getStyleInfoStack(styleInfo, stackIndex);
+      Stack<Object> styleInfoStack = _getStyleInfoStack(styleInfo, stackIndex);
 
       // push new value
       styleInfoStack.push(value);
@@ -1337,17 +1345,18 @@
   /**
    * Returns the Stack for a Style info, creating it, if necessary.
    */
-  private static Stack _getStyleInfoStack(
+  @SuppressWarnings("unchecked")
+  private static Stack<Object> _getStyleInfoStack(
     Stack[] styleInfo,
     int     stackIndex
     )
   {
-    Stack styleInfoStack = styleInfo[stackIndex];
+    Stack<Object> styleInfoStack = styleInfo[stackIndex];
 
     if (styleInfoStack == null)
     {
       // create new stack
-      styleInfoStack = new Stack();
+      styleInfoStack = new Stack<Object>();
 
       // push on initial default
       styleInfoStack.push(_STYLE_DEFAULTS[stackIndex]);
@@ -1400,6 +1409,7 @@
       return _value;
     }
 
+    @Override
     public Object clone()
     {
       int length = _value.length;
@@ -1461,7 +1471,7 @@
   };
 
   /** HashMap mapping css vertical-align to the valign attribute values */
-  private static Map _sSupportedVAligns = null;
+  private static Map<String, String> _sSupportedVAligns = null;
 
   /**
    * Initialize the library information.
@@ -1481,7 +1491,7 @@
     //
     // initialize the set of supported css vertical alignments
     //
-    _sSupportedVAligns = new HashMap(13);
+    _sSupportedVAligns = new HashMap<String, String>(13);
 
     for (int i = 0; i < _VALIGNS_SUPPORTED.length; i++)
     {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java Fri Aug 11 09:24:50 2006
@@ -35,8 +35,7 @@
     super();
   }
 
-
-
+  @Override
   public RendererManager createRendererManager(String facet)
   {
     RendererManager manager = super.createRendererManager(facet);
@@ -77,7 +76,7 @@
     BaseLookAndFeel.applyFacet(rendererFactory, facet);
   }
 
-
+  @Override
   protected RendererFactory getDefaultFactory()
   {
     return _FACTORY;



Mime
View raw message