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 [3/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/ElementRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/ElementRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/ElementRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/ElementRenderer.java Fri Aug 11 09:24:50 2006
@@ -58,6 +58,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -82,6 +83,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node) throws IOException

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/LogicalNodeRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/LogicalNodeRenderingContext.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/LogicalNodeRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/LogicalNodeRenderingContext.java Fri Aug 11 09:24:50 2006
@@ -257,11 +257,11 @@
   protected String getSkinResourceMappedKey(String key)
   {
     String mappedKey = null;
-    Map keyMap = getSkinResourceKeyMap();
+    Map<String, String> keyMap = getSkinResourceKeyMap();
     
     if (keyMap != null)
     {
-      mappedKey = (String)keyMap.get(key);
+      mappedKey = keyMap.get(key);
       // if it isn't in the map, just use the key itself.
       if (mappedKey == null)
         mappedKey = key;
@@ -308,7 +308,7 @@
 
   }
 
-
+  @Override
   public Object clone()
   {
     LogicalNodeRenderingContext context;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeRole.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeRole.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeRole.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeRole.java Fri Aug 11 09:24:50 2006
@@ -103,6 +103,7 @@
   /**
    * Returns a String useful for debugging.
    */
+  @Override
   public String toString()
   {
     StringBuffer buffer = new StringBuffer();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/NodeUtils.java Fri Aug 11 09:24:50 2006
@@ -205,14 +205,14 @@
    */
   public static void addIndexedChildren(
     MutableUINode    parentNode,
-    Iterator      indexedChildren
+    Iterator<UINode> indexedChildren
     )
   {
     if ((parentNode != null) && (indexedChildren != null))
     {
       while (indexedChildren.hasNext())
       {
-        UINode currNode = (UINode)indexedChildren.next();
+        UINode currNode = indexedChildren.next();
         parentNode.addIndexedChild(currNode);
       }
     }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RenderedNodeRenderingContext.java Fri Aug 11 09:24:50 2006
@@ -85,7 +85,7 @@
     }
   }
 
-
+  @Override
   public void pushRenderedChild(
     UIXRenderingContext currentContext,
     UINode renderedChild
@@ -117,7 +117,7 @@
     super.pushRenderedChild(currentContext, renderedChild);
   }
 
-
+  @Override
   public void popRenderedChild(UIXRenderingContext currentContext)
   {
     // handle cleaning up any of the dataproviders
@@ -219,7 +219,7 @@
     return _nodePropertyMap.get(ancestorIndex, key, defaultValue);
   }
 
-
+  @Override
   public Object clone()
   {
     RenderedNodeRenderingContext context = (RenderedNodeRenderingContext)
@@ -254,6 +254,7 @@
    * <p>
    * The default for this property is relatively small.
    */
+  @Override
   protected int getDefaultNodeStackSize()
   {
     return _DEFAULT_STACK_SIZE;
@@ -276,6 +277,7 @@
    * Reset the PortletContext after use so that it can be resued without
    * pinning unnecessary objects into memory
    */
+  @Override
   protected void reset()
   {
     // reset the superclass
@@ -488,7 +490,7 @@
       _frameIndex   = -1;
     }
 
-
+    @Override
     public Object clone()
     {
       StackFrameMap stack;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererFactoryImpl.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererFactoryImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererFactoryImpl.java Fri Aug 11 09:24:50 2006
@@ -125,5 +125,6 @@
   }
 
 
-  private OptimisticHashMap _renderers = new OptimisticHashMap(101);
+  private OptimisticHashMap<String, Object> _renderers = 
+    new OptimisticHashMap<String, Object>(101);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererManager.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererManager.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererManager.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RendererManager.java Fri Aug 11 09:24:50 2006
@@ -74,6 +74,7 @@
    * @see org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager#getLookAndFeel
    * @see org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeel#getRendererManager
    */
+  @Deprecated
   static public RendererManager getDefaultRendererManager()
   {
     if (_sDefaultInstance == null)
@@ -94,6 +95,7 @@
    * @see org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager#getLookAndFeel
    * @see org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeel#getRendererManager
    */
+  @Deprecated
   static public RendererManager createDefaultRendererManager()
   {
     return new BaseDesktopLookAndFeel().getRendererManager();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java Fri Aug 11 09:24:50 2006
@@ -98,6 +98,7 @@
 
   }
 
+  @Override
   public FacesContext getFacesContext()
   {
     return _facesContext;
@@ -175,7 +176,7 @@
       Configuration config = getConfiguration();
       if (config != null)
       {
-        Object o = config.getProperty(config.RENDERER_MANAGER);
+        Object o = config.getProperty(Configuration.RENDERER_MANAGER);
         if (o instanceof RendererManager)
         {
           manager = _manager = (RendererManager) o;
@@ -236,7 +237,7 @@
   {
     boolean doAdd = (dataObject != null);
 
-    Map dataObjects = _getDataObjectMap(namespaceURI, doAdd);
+    Map<String, DataObject> dataObjects = _getDataObjectMap(namespaceURI, doAdd);
 
     if (doAdd)
     {
@@ -263,7 +264,7 @@
    */
   public void setDataObjectMap(
     String     namespaceURI,
-    Map dataObjectDict)
+    Map<String, DataObject> dataObjectDict)
   {
     if (dataObjectDict != null)
     {
@@ -283,6 +284,7 @@
    * Developers cannot override this method;  they must override
    * the 3-argument getDataObject().
    */
+  @Override
   public final DataObject getDataObject(
     String namespaceURI,
     String name)
@@ -299,6 +301,7 @@
    * Then, it will look for DataObjects added with setDataObject().
    * @since 2.0.12
    */
+  @Override
   public DataObject getDataObject(
     UIXRenderingContext context,
     String namespaceURI,
@@ -310,11 +313,11 @@
 
     if (data == null)
     {
-      Map dataObjects = _getDataObjectMap(namespaceURI, false);
+      Map<String, DataObject> dataObjects = _getDataObjectMap(namespaceURI, false);
 
       if (dataObjects != null)
       {
-        data =  (DataObject) dataObjects.get(name);
+        data = dataObjects.get(name);
       }
     }
 
@@ -325,6 +328,7 @@
   /**
    * Gets a property stored on the context.
    */
+  @Override
   public Object getProperty(
     String namespace,
     Object key
@@ -553,11 +557,13 @@
    * Clears all properties from the context.  Not part of
    * the RenderingContext interface.
    */
+  @Override
   public void resetProperties()
   {
     super.resetProperties();
   }
 
+  @Override
   public Object clone()
   {
     RootRenderingContext context = (RootRenderingContext)super.clone();
@@ -598,12 +604,14 @@
    * Returns the default initial number of nodes in the stack of
    * logical nodes.
    */
+  @Override
   protected int getDefaultNodeStackSize()
   {
     return _DEFAULT_STACK_SIZE;
   }
 
 
+  @Override
   protected int getDefaultPropertyMapSize()
   {
     return _DEFAULT_PROPERTY_MAP_SIZE;
@@ -624,7 +632,7 @@
 
     if (config != null)
     {
-      Object o = config.getProperty(config.LOOK_AND_FEEL_MANAGER);
+      Object o = config.getProperty(Configuration.LOOK_AND_FEEL_MANAGER);
       if (o instanceof LookAndFeelManager)
       {
         manager = (LookAndFeelManager)o;
@@ -643,14 +651,15 @@
   /**
    * Returns the Map of dataObjects for this namespace.
    */
-  private Map _getDataObjectMap(
+  @SuppressWarnings("unchecked")
+  private Map<String, DataObject> _getDataObjectMap(
     String   namespace,
     boolean  createIfNull
     )
   {
-    Map dataObjects = (Map)
-                                    ArrayMap.getByIdentity(_dataObjects,
-                                                           namespace);
+    Map<String, DataObject> dataObjects = 
+      (Map<String, DataObject>) ArrayMap.getByIdentity(_dataObjects,
+                                                       namespace);
 
     if (createIfNull && (dataObjects == null))
     {
@@ -658,7 +667,7 @@
       // create a hashtable of properties for this namespace and add it
       // to the map of properties
       //
-      dataObjects = new Hashtable(11);
+      dataObjects = new Hashtable<String, DataObject>(11);
 
       _dataObjects = ArrayMap.put(_dataObjects,
                                   namespace,
@@ -682,7 +691,7 @@
       // image cache.  That way, we can ensure that each application
       // creates its own local image cache.
       String contextPath = (String) _getContextProperty(CONTEXT_PATH_PROPERTY);
-      String path = config.getPath(config.IMAGES_CACHE_DIRECTORY,
+      String path = config.getPath(Configuration.IMAGES_CACHE_DIRECTORY,
                                    contextPath);
 
       provider = FileSystemImageCache.getSharedCache(path);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/TextNode.java Fri Aug 11 09:24:50 2006
@@ -50,6 +50,7 @@
    * Returns the text for the current rendering context.
    * For this class, just returns the value passed to the constructor.
    */
+  @Override
   protected Object getTextObject(
     UIXRenderingContext context
     )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java Fri Aug 11 09:24:50 2006
@@ -170,6 +170,7 @@
 
 
   /** @deprecated use CHILD_TYPE_TEXT string instead */
+  @Deprecated
   public static final AttributeKey CHILD_TYPE_TEXT_ATTR = new AttributeKey("childTypeText");
 
   /** Type: String */
@@ -372,6 +373,7 @@
                                      new AttributeKey("blockOnEverySubmit");
 
   /** @deprecated Do not use this attribute */
+  @Deprecated
   public static final AttributeKey ANCESTOR_ID_ATTR     = new AttributeKey("ancestorID");
 
 
@@ -1207,6 +1209,7 @@
   public static final String SWITCH_APP_TYPE_GOTO   = "goto";
 
   /** @deprecated The application switcher no longer has a back button */
+  @Deprecated
   public static final String SWITCH_APP_TYPE_BACK   = "back";
 
   // HideShow
@@ -1305,6 +1308,7 @@
   /**
    * @deprecated This constant is for dev purposes only
    */
+  @Deprecated
   public static final AttributeKey DESCRIPTION_ATTR =
     new AttributeKey("description", 42);
 
@@ -1312,11 +1316,13 @@
   /**
    * @deprecated This constant is for dev purposes only
    */
+  @Deprecated
   public static final AttributeKey SELECT_ATTR = new AttributeKey("select");
 
   /**
    * @deprecated This constant is for dev purposes only
    */
+  @Deprecated
   public static final String PARTIAL_ROOT_NAME = "partialRoot";
 
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINode.java Fri Aug 11 09:24:50 2006
@@ -141,7 +141,7 @@
    * <p>
    * @see #getNamedChild
    */
-  public Iterator getChildNames(UIXRenderingContext context);
+  public Iterator<String> getChildNames(UIXRenderingContext context);
 
 
   /**
@@ -157,7 +157,7 @@
    * <p>
    * @see #getAttributeValue
    */
-  public Iterator getAttributeNames(UIXRenderingContext context);
+  public Iterator<AttributeKey> getAttributeNames(UIXRenderingContext context);
 
   /**
    * Returns the value of the attribute with the specified name in the

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UINodeProxy.java Fri Aug 11 09:24:50 2006
@@ -151,7 +151,7 @@
    * <p>
    * @see #getNamedChild
    */
-  public Iterator getChildNames(
+  public Iterator<String> getChildNames(
     UIXRenderingContext context
     )
   {
@@ -172,7 +172,7 @@
    * <p>
    * @see #getAttributeValue
    */
-  public Iterator getAttributeNames(
+  public Iterator<AttributeKey> getAttributeNames(
     UIXRenderingContext context
     )
   {
@@ -261,7 +261,7 @@
     getUINode().render(context, node);
   }
 
-
+  @Override
   public String toString()
   {
     String debugString = getClass().getName();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java Fri Aug 11 09:24:50 2006
@@ -112,14 +112,14 @@
    * the correct translated value key.
    * @param mapping 
    */
-  public void setSkinResourceKeyMap(Map mapping);
+  public void setSkinResourceKeyMap(Map<String, String> mapping);
 
   
   /**
    * Get the translatedValue Map.
    * @param mapping 
    */ 
-  public Map getSkinResourceKeyMap();
+  public Map<String, String> getSkinResourceKeyMap();
   
   /**
    * Returns a translated value from the skin.

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FireAction.java Fri Aug 11 09:24:50 2006
@@ -96,6 +96,7 @@
   /**
    * Implementation of ClientAction.getScript().
    */
+  @Override
   public String getScript
     (UIXRenderingContext context,
      UINode node,
@@ -117,6 +118,7 @@
   /**
    * Override of ClientAction.writeDependencies().
    */
+  @Override
   public void writeDependencies(
     UIXRenderingContext context,
     UINode node
@@ -306,6 +308,7 @@
     return ActionUtils.cloneParameterArray(_parameters);
   }
 
+  @Override
   public Parameter[] getParameters(
     UIXRenderingContext context,
     UINode           node)
@@ -385,6 +388,7 @@
   /**
    * Override of ClientAction.renderAsEvent().
    */
+  @Override
   public boolean renderAsEvent(
     UIXRenderingContext context,
     UINode           node)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/action/FirePartialAction.java Fri Aug 11 09:24:50 2006
@@ -160,6 +160,7 @@
   /**
    * Implementation of FireAction.getSubmitScript().
    */
+  @Override
   protected String getSubmitScript
     (UIXRenderingContext context,
      UINode node,
@@ -249,6 +250,7 @@
     return buffer.toString();
   }
 
+  @Override
   protected String getChangeScript
     (UIXRenderingContext context,
      UINode node,
@@ -301,6 +303,7 @@
   /**
    * Override of FireAction.renderAsEvent().
    */
+  @Override
   public boolean renderAsEvent(
     UIXRenderingContext context,
     UINode           node)
@@ -338,6 +341,7 @@
   /**
    * Override of ClientAction.writeDependencies().
    */
+  @Override
   public void writeDependencies(
     UIXRenderingContext context,
     UINode node
@@ -376,6 +380,7 @@
   /**
    * Override of ClientAction.isTriggerRequired()
    */
+  @Override
   public boolean isTriggerRequired(
     UIXRenderingContext context,
     UINode           node
@@ -391,6 +396,7 @@
   /**
    * Override of ClientAction.renderTrigger().
    */
+  @Override
   public void renderTrigger(
     UIXRenderingContext context,
     UINode           node
@@ -450,6 +456,7 @@
     buffer.append(value ? "1" : "0");
   }
 
+  @Override
   public Parameter[] getParameters(
     UIXRenderingContext context,
     UINode           node)
@@ -513,11 +520,13 @@
       return _sInstance;
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _FIRE_PARTIAL_ACTION_SCRIPTLET;
     }
 
+    @Override
     protected void outputScriptletContent(
       FacesContext context,
       RenderingContext arc)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/beans/BaseWebBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/beans/BaseWebBean.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/beans/BaseWebBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/beans/BaseWebBean.java Fri Aug 11 09:24:50 2006
@@ -54,6 +54,7 @@
    * This property is typically only needed when writing client-side
    * JavaScript.
    */
+  @Override
   public final void setID(String newID)
   {
     // stub placeholder for when we get rid of bogus need for implementation
@@ -324,6 +325,7 @@
    * Sets whether the bean is rendered.  When set to false,
    * no output will be delivered for this bean.
    */
+  @Override
   public void setRendered(
     boolean rendered
     )
@@ -337,6 +339,7 @@
    * Sets whether the bean is rendered.  When set to false,
    * no output will be delivered for this bean.
    */
+  @Override
   public boolean isRendered()
   {
     // Stub for backwards compatibility
@@ -678,6 +681,7 @@
    * Utility method for rendered code that transforms Boolean->boolean.
    * @deprecated in favor of the version taking an Object
    */
+  @Deprecated
   public static boolean resolveBoolean(
     Boolean value,
     boolean defaultValue
@@ -692,6 +696,7 @@
    * Utility method for rendered code that transforms Boolean->boolean.
    * @deprecated in favor of the version taking an Object
    */
+  @Deprecated
   public static boolean resolveBoolean(
     Boolean value
     )
@@ -728,6 +733,7 @@
    * Utility method for rendered code that transforms Integer->int.
    * @deprecated in favor of the version taking an Object
    */
+  @Deprecated
   public static int resolveInteger(
     Integer value
     )
@@ -739,6 +745,7 @@
    * Utility method for rendered code that transforms Integer->int.
    * @deprecated in favor of the version taking an Object
    */
+  @Deprecated
   public static int resolveInteger(
     Integer value,
     int     defaultValue
@@ -778,6 +785,7 @@
    * Utility method for rendered code that transforms Long->long.
    * @deprecated in favor of the version taking an Object
    */
+  @Deprecated
   public static long resolveLong(
     Long value
     )
@@ -789,6 +797,7 @@
    * Utility method for rendered code that transforms Long->long.
    * @deprecated in favor of the version taking an Object
    */
+  @Deprecated
   public static long resolveLong(
     Long  value,
     long  defaultValue

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayAttributeMap.java Fri Aug 11 09:24:50 2006
@@ -96,7 +96,7 @@
     }
   }
 
-  public Iterator attributeKeys(
+  public Iterator<AttributeKey> attributeKeys(
     UIXRenderingContext context
     )
   {
@@ -104,11 +104,11 @@
 
     if (size == 0)
       return null;
-    ArrayList keyValuesList = new ArrayList();
+    ArrayList<AttributeKey> keyValuesList = new ArrayList<AttributeKey>();
     int i = (size-1)*2;
     while(i>=0)
     {
-      keyValuesList.add(_keyValues[i]);
+      keyValuesList.add((AttributeKey)_keyValues[i]);
       i=i-2;
     }
    return  keyValuesList.iterator();
@@ -123,6 +123,7 @@
   /**
    * Clones the map.
    */
+  @Override
   public Object clone()
   {
     try
@@ -131,7 +132,7 @@
 
       if (_keyValues != _EMPTY_KEY_VALUES)
       {
-        am._keyValues = (Object[])_keyValues.clone();
+        am._keyValues = _keyValues.clone();
       }
 
       return am;
@@ -143,7 +144,7 @@
     }
   }
 
-
+  @Override
   public String toString()
   {
     int entryCount = size() * 2;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ArrayUINodeList.java Fri Aug 11 09:24:50 2006
@@ -164,7 +164,7 @@
     _nodeCount = 0;
   }
   
-  
+  @Override
   public Object clone()
   {
     try

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/AttributeMap.java Fri Aug 11 09:24:50 2006
@@ -60,5 +60,5 @@
    * Returns an Iterator of all of the AttributeKeys in the AttributeMap
    * that values exist for.
    */
-  public Iterator attributeKeys(UIXRenderingContext context);
+  public Iterator<AttributeKey> attributeKeys(UIXRenderingContext context);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/ContextMap.java Fri Aug 11 09:24:50 2006
@@ -57,7 +57,7 @@
    * @throws IllegalArgumentException if either the <code>key</code> or
    *         <code>value</code> is null.
    */
-  public void set(Object key, Object value);
+  public void set(String key, Object value);
 
   /**
    * Returns an Iterator of all of the keys in the ContextMap given
@@ -70,5 +70,5 @@
    *                                 keys.
    * @return The Iterator of keys in the RenderingContext
    */
-  public Iterator keys(UIXRenderingContext context);
+  public Iterator<String> keys(UIXRenderingContext context);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectListNodeList.java Fri Aug 11 09:24:50 2006
@@ -198,6 +198,7 @@
    * Returns the size of the DataObjectListNodeList;  returns
    * (number of contained nodes) * (size of the DataObjectList).
    */
+  @Override
   public int size(UIXRenderingContext context)
   {
     DataObjectList dol = getDataObjectList(context);
@@ -206,7 +207,7 @@
     return dol.getLength() * super.size(context);
   }
 
-
+  @Override
   public UINode getUINode(
     UIXRenderingContext context,
     int index
@@ -251,6 +252,7 @@
     }
   }
 
+  @Override
   public Object clone()
   {
     DataObjectListNodeList cloned = (DataObjectListNodeList) super.clone();
@@ -298,6 +300,7 @@
     }
   }
 
+  @Override
   protected UINodeList getUINodeList(UIXRenderingContext context)
   {
     return _baseNodes;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/DataObjectUINodeProxy.java Fri Aug 11 09:24:50 2006
@@ -80,6 +80,7 @@
     _current  = current;
   }
 
+  @Override
   public Object getAttributeValue(
     UIXRenderingContext context,
     AttributeKey     attrKey
@@ -110,6 +111,7 @@
     return value;
   }
 
+  @Override
   public int getIndexedChildCount(UIXRenderingContext context)
   {
     int count;
@@ -137,6 +139,7 @@
     return count;
   }
 
+  @Override
   public void render(UIXRenderingContext context, UINode node)
     throws IOException
   {
@@ -153,7 +156,7 @@
     }
   }
 
-
+  @Override
   public UINode getIndexedChild(
     UIXRenderingContext context,
     int              childIndex)
@@ -187,7 +190,7 @@
     return child;
   }
 
-
+  @Override
   public UINode getNamedChild(
     UIXRenderingContext context,
     String           childName)
@@ -221,6 +224,7 @@
     return child;
   }
 
+  @Override
   protected UINode getUINode()
   {
     return _baseNode;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/FlaggedAttributeMap.java Fri Aug 11 09:24:50 2006
@@ -57,7 +57,7 @@
     super(size, increment);
   }
   
-  
+  @Override
   public Object getAttribute(
     UIXRenderingContext context,
     AttributeKey     key
@@ -77,6 +77,7 @@
     return super.getAttribute(context, key);
   }
   
+  @Override
   protected void putAttribute(
     AttributeKey key,
     Object       value
@@ -93,6 +94,7 @@
     super.putAttribute(key, value);
   }
 
+  @Override
   protected void removeAttribute(
     AttributeKey key
     )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/MapContextMap.java Fri Aug 11 09:24:50 2006
@@ -35,7 +35,7 @@
   }
 
   public MapContextMap(
-    Map map
+    Map<String, Object> map
     )
   {
     if (map == null)
@@ -53,8 +53,8 @@
   }
 
   public void set(
-    Object  key,
-    Object  value
+      String  key,
+      Object  value
     )
   {
     if (value == null)
@@ -67,13 +67,13 @@
     }
   }
 
-  public Iterator keys(
+  public Iterator<String> keys(
     UIXRenderingContext context
     )
   {  
     if(_map instanceof ArrayMap)
     {
-      return ((ArrayMap) _map).keys();
+      return ((ArrayMap<String, Object>) _map).keys();
     }
     return _map.keySet().iterator();
   }
@@ -83,10 +83,10 @@
     return _map.size();
   }
 
-  protected Map createDefaultMap()
+  protected Map<String, Object> createDefaultMap()
   {
-    return new HashMap(13);
+    return new HashMap<String, Object>(13);
   }
 
-  private Map _map;
+  private Map<String, Object> _map;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/Parameter.java Fri Aug 11 09:24:50 2006
@@ -94,6 +94,7 @@
   /**
    * Makes a clone of the parameter.
    */
+  @Override
   public Object clone()
   {
     try

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeAttributeMap.java Fri Aug 11 09:24:50 2006
@@ -71,7 +71,7 @@
     }
   }
 
-  public Iterator attributeKeys(
+  public Iterator<AttributeKey> attributeKeys(
     UIXRenderingContext context
     )
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeListProxy.java Fri Aug 11 09:24:50 2006
@@ -129,6 +129,7 @@
     }
   }
   
+  @Override
   public Object clone()
   {
     try

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UINodeUINodeList.java Fri Aug 11 09:24:50 2006
@@ -175,7 +175,7 @@
     }
   }
   
-  
+  @Override
   public Object clone()
   {
     try

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/collection/UnmodifiableCompoundNodeList.java Fri Aug 11 09:24:50 2006
@@ -118,6 +118,7 @@
       "It is illegal to clear children from an UnmodifiableCompoundNodeList");
   }
   
+  @Override
   public Object clone()
   {
     try

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java Fri Aug 11 09:24:50 2006
@@ -140,6 +140,7 @@
     setCurrentDataObject(parentContext.getCurrentDataObject());
   }
 
+  @Override
   protected void reset()
   {
     super.reset();
@@ -150,8 +151,7 @@
     _skinResourceKeyMap = null;
   }
 
-
-
+  @Override
   public FacesContext getFacesContext()
   {
     return _nonCompositeContext.getFacesContext();
@@ -222,7 +222,7 @@
    * the correct translated value key.
    * @param mapping
    */
-  public void setSkinResourceKeyMap(Map mapping)
+  public void setSkinResourceKeyMap(Map<String, String> mapping)
   {
     _skinResourceKeyMap = mapping;
   }
@@ -231,7 +231,7 @@
    * Get the _skinResourceKeyMap Map.
    * @param mapping
    */
-  public Map getSkinResourceKeyMap()
+  public Map<String, String> getSkinResourceKeyMap()
   {
     return _skinResourceKeyMap;
   }
@@ -260,7 +260,7 @@
     return _nonCompositeContext.getRenderedAncestorNode(index);
   }
 
-
+  @Override
   public void pushRenderedChild(
     UIXRenderingContext currentContext,
     UINode renderedChild
@@ -273,6 +273,7 @@
     super.pushRenderedChild(currentContext, renderedChild);
   }
 
+  @Override
   public void popRenderedChild(UIXRenderingContext currentContext)
   {
     // handle cleaning up any of the dataproviders
@@ -287,6 +288,7 @@
   /**
    * Returns the DataObject for the given namespace and name pair.
    */
+  @Override
   public DataObject getDataObject(
     UIXRenderingContext context,
     String namespaceURI,
@@ -309,6 +311,7 @@
    * Returns a DataObject for the current node (such as a row
    * of a table).
    */
+  @Override
   public DataObject getCurrentDataObject()
   {
     if (_globalCurrentDataObject)
@@ -322,6 +325,7 @@
    * <p>
    * @see #getCurrentDataObject
    */
+  @Override
   public DataObject setCurrentDataObject(
     DataObject newDataObject
     )
@@ -545,6 +549,7 @@
     return _nonCompositeContext.getPartialPageContext();
   }
 
+  @Override
   public Object clone()
   {
     CompositeRenderingContext context = (CompositeRenderingContext)super.clone();
@@ -583,7 +588,7 @@
   private CompositeRenderingContext _nextContext;
   private UIXRenderingContext _parentContext;
   private UIXRenderingContext _nonCompositeContext;
-  private Map  _skinResourceKeyMap;
+  private Map<String, String> _skinResourceKeyMap;
 
   private boolean _globalCurrentDataObject;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java Fri Aug 11 09:24:50 2006
@@ -30,7 +30,6 @@
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 import org.apache.myfaces.trinidadinternal.ui.data.DataObject;
-import org.apache.myfaces.trinidadinternal.ui.laf.base.*;
 
 /**
  * Renderer used by composite UINode renderers to render content.
@@ -44,8 +43,7 @@
     String childName
     )
   {
-    ContextPoppingUINode node =
-                         (ContextPoppingUINode)_sContextPoppers.get(childName);
+    ContextPoppingUINode node = _sContextPoppers.get(childName);
 
     if (node == null)
     {
@@ -64,8 +62,7 @@
   {
     Integer key = IntegerUtils.getInteger(childIndex);
 
-    ContextPoppingUINode node =
-                               (ContextPoppingUINode)_sContextPoppers.get(key);
+    ContextPoppingUINode node = _sContextPoppers.get(key);
 
     if (node == null)
     {
@@ -92,7 +89,7 @@
     _childIndex = childIndex;
   }
 
-
+  @Override
   public int getIndexedChildCount(
     UIXRenderingContext context
     )
@@ -107,7 +104,7 @@
     }
   }
 
-
+  @Override
   public UINode getIndexedChild(
     UIXRenderingContext context,
     int              childIndex
@@ -149,6 +146,7 @@
     }
   }
 
+  @Override
   protected Object getAttributeValueImpl(
     UIXRenderingContext context,
     AttributeKey     attrKey,
@@ -176,6 +174,7 @@
     }
   }
 
+  @Override
   protected Renderer getRenderer(
     UIXRenderingContext context,
     UINode           dataNode
@@ -195,6 +194,7 @@
     return _childIndex;
   }
 
+  @Override
   public String toString()
   {
     String text = super.toString();
@@ -251,8 +251,8 @@
 
   private static final Renderer _RENDERER = new ContextPoppingRenderer();
 
-  private static OptimisticHashMap _sContextPoppers =
-                                                    new OptimisticHashMap(203);
+  private static OptimisticHashMap<Object, ContextPoppingUINode> _sContextPoppers = 
+    new OptimisticHashMap<Object, ContextPoppingUINode>(203);
 
   private String _childName;
   private int    _childIndex;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPropertyUINode.java Fri Aug 11 09:24:50 2006
@@ -58,11 +58,13 @@
     _propertyValue     = propertyValue;
   }
 
+  @Override
   public NodeRole getNodeRole(UIXRenderingContext context)
   {
     return UIConstants.STATE_ROLE;
   }
 
+  @Override
   protected Renderer getRenderer(
     UIXRenderingContext context,
     UINode           dataNode
@@ -73,6 +75,7 @@
 
   private class Rndr extends BaseRenderer
   {
+    @Override
     public void render(
       UIXRenderingContext context,
       UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeBoundValue.java Fri Aug 11 09:24:50 2006
@@ -44,8 +44,7 @@
     AttributeKey attrKey
     )
   {
-    RootAttributeBoundValue boundValue =
-      (RootAttributeBoundValue)_boundValues.get(attrKey);
+    RootAttributeBoundValue boundValue = _boundValues.get(attrKey);
 
     if (boundValue == null)
     {
@@ -101,7 +100,8 @@
     return null;
   }
 
-  private static OptimisticHashMap _boundValues = new OptimisticHashMap();
+  private static OptimisticHashMap<AttributeKey, RootAttributeBoundValue> _boundValues = 
+    new OptimisticHashMap<AttributeKey, RootAttributeBoundValue>();
 
   private AttributeKey _attrKey;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootAttributeMap.java Fri Aug 11 09:24:50 2006
@@ -41,6 +41,7 @@
   {
   }
   
+  @Override
   protected UINode getUINode(
     UIXRenderingContext context
     )
@@ -58,6 +59,7 @@
     return null;
   }
   
+  @Override
   protected UIXRenderingContext getRenderingContext(UIXRenderingContext context)
   {
     if (context == null)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java Fri Aug 11 09:24:50 2006
@@ -39,8 +39,7 @@
     String childName
     )
   {
-    RootChildBoundValue node =
-                         (RootChildBoundValue)_boundValues.get(childName);
+    RootChildBoundValue node = _boundValues.get(childName);
 
     if (node == null)
     {
@@ -59,7 +58,7 @@
   {
     Integer key = IntegerUtils.getInteger(childIndex);
 
-    RootChildBoundValue node = (RootChildBoundValue)_boundValues.get(key);
+    RootChildBoundValue node = _boundValues.get(key);
 
     if (node == null)
     {
@@ -113,7 +112,8 @@
     return null;
   }
 
-  private static Hashtable _boundValues = new Hashtable(51);
+  private static Hashtable<Object, RootChildBoundValue> _boundValues = 
+    new Hashtable<Object, RootChildBoundValue>(51);
 
   private String _childName;
   private int    _childIndex;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootUINodeList.java Fri Aug 11 09:24:50 2006
@@ -38,6 +38,7 @@
   {
   }
     
+  @Override
   protected UINode getUINode(
     UIXRenderingContext context
     )
@@ -52,6 +53,7 @@
     }
   }
 
+  @Override
   protected UIXRenderingContext getRenderingContext(UIXRenderingContext context)
   {
     if (context == null)
@@ -60,7 +62,7 @@
     return context.getParentContext();
   }
 
-
+  @Override
   public UINode getUINode(
     UIXRenderingContext context,
     int              index

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/DictionaryData.java Fri Aug 11 09:24:50 2006
@@ -39,14 +39,14 @@
    */
   public DictionaryData()
   {
-    _table = new Hashtable(7);
+    _table = new Hashtable<Object, Object>(7);
   }
 
   /**
    * Creates a DictionaryData, using the provided Dictionary
    * for storage.
    */
-  public DictionaryData(Dictionary table)
+  public DictionaryData(Dictionary<Object, Object> table)
   {
     _table = table;
   }
@@ -56,7 +56,7 @@
    * Creates a DictionaryData initialized with a single
    * pair of data.
    */
-  public DictionaryData(Object select, Object data)
+  public DictionaryData(String select, String data)
   {
     this();
     put(select, data);
@@ -90,12 +90,12 @@
     put(select, value);
   }
   
-  public Iterator keys(
+  public Iterator<Object> keys(
     UIXRenderingContext context
     )
   {
-    ArrayList keyList = new ArrayList();
-    Enumeration keyEnum = _table.keys();  
+    ArrayList<Object> keyList = new ArrayList<Object>();
+    Enumeration<Object> keyEnum = _table.keys();  
     while(keyEnum.hasMoreElements())
     {
       keyList.add(keyEnum.nextElement());
@@ -103,5 +103,5 @@
     return keyList.iterator();
   }
   
-  private Dictionary _table;
+  private Dictionary<Object, Object> _table;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/KeyedDataObject.java Fri Aug 11 09:24:50 2006
@@ -28,5 +28,5 @@
  */
 public interface KeyedDataObject extends DataObject
 {
-  public Iterator keys(UIXRenderingContext context);
+  public Iterator<Object> keys(UIXRenderingContext context);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/ListDataObjectList.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/ListDataObjectList.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/ListDataObjectList.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/ListDataObjectList.java Fri Aug 11 09:24:50 2006
@@ -33,7 +33,7 @@
    */
   public ListDataObjectList()
   {
-    _list = new ArrayList();
+    _list = new ArrayList<DataObject>();
   }
 
   /**
@@ -43,7 +43,7 @@
    */
   public ListDataObjectList(int initialCapacity)
   {
-    _list = new ArrayList(initialCapacity);
+    _list = new ArrayList<DataObject>(initialCapacity);
   }
 
   /**
@@ -51,7 +51,7 @@
    *  Vector must be of type DataObject
    * @see DataObject
    */
-  public ListDataObjectList(Vector list)
+  public ListDataObjectList(Vector<DataObject> list)
   {
     _list = list;
   }
@@ -71,7 +71,7 @@
    */
   public DataObject removeItem(int index)
   {
-    return (DataObject) _list.remove(index);
+    return _list.remove(index);
   }
 
   /**
@@ -110,7 +110,7 @@
    */
   public DataObject getItem(int i) 
   {
-    return (DataObject) _list.get(i);
+    return _list.get(i);
   }
 
   /**
@@ -122,5 +122,5 @@
     return _list.size();
   }
 
-  private final List _list;
+  private final List<DataObject> _list;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/MapData.java Fri Aug 11 09:24:50 2006
@@ -37,14 +37,14 @@
    */
   public MapData()
   {
-    _table = new HashMap(7);
+    _table = new HashMap<Object, Object>(7);
   }
 
   /**
    * Creates a MapData, using the provided Map
    * for storage.
    */
-  public MapData(Map table)
+  public MapData(Map<Object, Object> table)
   {
     _table = table;
   }
@@ -88,12 +88,12 @@
     put(select, value);
   }
 
-  public Iterator keys(
+  public Iterator<Object> keys(
     UIXRenderingContext context
     )
   {
     return _table.keySet().iterator();
   }
 
-  private Map _table;
+  private Map<Object, Object> _table;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java Fri Aug 11 09:24:50 2006
@@ -64,7 +64,8 @@
    * Instead of using the actual class of the instance, use a superclass.
    * See above for reasons why this may be useful.
    */
-  static public DataObject getAdapter(Object instance, Class objClass)
+  @SuppressWarnings("unchecked")
+  static public DataObject getAdapter(Object instance, Class<?> objClass)
     throws IllegalAccessException, InstantiationException
   {
     if (instance == null)
@@ -74,12 +75,12 @@
       return (DataObject) instance;
 
     if (instance instanceof Map)
-      return new MapDataObject((Map) instance);
+      return new MapDataObject((Map<Object, Object>) instance);
 
     if (objClass == null)
       objClass = instance.getClass();
 
-    Class adapterClass = (Class) _sAdapters.get(objClass);
+    Class<?> adapterClass = _sAdapters.get(objClass);
     if (adapterClass != null)
     {
       BeanDOAdapter adapter = (BeanDOAdapter) adapterClass.newInstance();
@@ -163,8 +164,8 @@
    * Registers an adapter class to be used in place of introspection.
    */
   static public void registerAdapterClass(
-    Class beanClass,
-    Class adapterClass)
+    Class<?> beanClass,
+    Class<?> adapterClass)
   {
     // =-=AEW This forces classes to be loaded.  Should we allow
     // registration by string name?
@@ -177,7 +178,7 @@
 
   static private final class MapDataObject implements MutableDataObject
   {
-    public MapDataObject(Map map)
+    public MapDataObject(Map<Object, Object> map)
     {
       _map = map;
     }
@@ -195,10 +196,10 @@
       _map.put(select, value);
     }
 
-    private final Map _map;
+    private final Map<Object, Object> _map;
   }
 
-  static private final OptimisticHashMap _sAdapters =
-    new OptimisticHashMap(101);
+  static private final OptimisticHashMap<Class<?>, Class<?>> _sAdapters =
+    new OptimisticHashMap<Class<?>, Class<?>>(101);
   private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(BeanAdapterUtils.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java Fri Aug 11 09:24:50 2006
@@ -73,7 +73,7 @@
     if (instance == null)
       return null;
 
-    Class objClass = instance.getClass();
+    Class<?> objClass = instance.getClass();
     ClassInfo classInfo = _getIntrospectionInfo(objClass);
 
     BeanDOAdapter adapter = classInfo.hasWriters()
@@ -117,7 +117,7 @@
       _classInfo.updateValue(context, select, value, instance);
   }
 
-
+  @Override
   public String toString()
   {
     StringBuffer buffer = new StringBuffer(40);
@@ -130,7 +130,7 @@
     return buffer.toString();
   }
 
-  IntrospectionAdapter(Class objClass, ClassInfo classInfo)
+  IntrospectionAdapter(Class<?> objClass, ClassInfo classInfo)
   {
     _class = objClass;
     _classInfo = classInfo;
@@ -140,16 +140,16 @@
                                                    implements MutableDataObject
   {
     public MutableIntrospectionAdapter(
-      Class objClass,
+      Class<?> objClass,
       ClassInfo classInfo)
     {
       super(objClass, classInfo);
     }
   }
 
-  static private ClassInfo _getIntrospectionInfo(Class objClass)
+  static private ClassInfo _getIntrospectionInfo(Class<?> objClass)
   {
-    ClassInfo classInfo = (ClassInfo) _sIntrospectionInfo.get(objClass);
+    ClassInfo classInfo = _sIntrospectionInfo.get(objClass);
     if (classInfo == null)
     {
       classInfo = _createIntrospectionInfo(objClass);
@@ -163,27 +163,27 @@
   }
 
 
-  static private ClassInfo _createIntrospectionInfo(Class objClass)
+  static private ClassInfo _createIntrospectionInfo(Class<?> objClass)
   {
     if (objClass == Object.class)
       return null;
 
-    Map readers = null;
-    Map writers = null;
+    Map<String, PropertyReader> readers = null;
+    Map<String, PropertyWriter> writers = null;
 
     // Introspection fails on "package-private" classes.  But
     // that shouldn't stop us from looking for a public superclass,
     // or any public interfaces this class implements
     if (!Modifier.isPublic(objClass.getModifiers()))
     {
-      Class superClass = objClass.getSuperclass();
+      Class<?> superClass = objClass.getSuperclass();
       if (superClass != null)
       {
         ClassInfo superClassInfo = _getIntrospectionInfo(superClass);
         if (superClassInfo != null)
         {
-          readers = new HashMap();
-          writers = new HashMap();
+          readers = new HashMap<String, PropertyReader>();
+          writers = new HashMap<String, PropertyWriter>();
           superClassInfo.putAllReadersInto(readers);
           superClassInfo.putAllWritersInto(writers);
         }
@@ -196,19 +196,19 @@
         if (interfaceInfo != null)
         {
           if (readers == null)
-            readers = new HashMap();
+            readers = new HashMap<String, PropertyReader>();
           interfaceInfo.putAllReadersInto(readers);
 
           if (writers == null)
-            writers = new HashMap();
+            writers = new HashMap<String, PropertyWriter>();
           interfaceInfo.putAllWritersInto(writers);
         }
       }
     }
     else
     {
-      readers = new HashMap();
-      writers = new HashMap();
+      readers = new HashMap<String, PropertyReader>();
+      writers = new HashMap<String, PropertyWriter>();
 
       try
       {
@@ -260,18 +260,20 @@
 
   static private class ClassInfo
   {
-    public ClassInfo(Map readers, Map writers)
+    public ClassInfo(
+        Map<String, PropertyReader> readers, 
+        Map<String, PropertyWriter> writers)
     {
       _readers = readers;
       _writers = writers;
     }
 
-    public void putAllReadersInto(Map into)
+    public void putAllReadersInto(Map<String, PropertyReader> into)
     {
       into.putAll(_readers);
     }
 
-    public void putAllWritersInto(Map into)
+    public void putAllWritersInto(Map<String, PropertyWriter> into)
     {
       into.putAll(_writers);
     }
@@ -343,8 +345,8 @@
     }
 
 
-    private Map _readers;
-    private Map _writers;
+    private Map<String, PropertyReader> _readers;
+    private Map<String, PropertyWriter> _writers;
   }
 
   //
@@ -430,8 +432,8 @@
       }
     }
 
-    private final Method _method;
-    private final Class  _type;
+    private final Method   _method;
+    private final Class<?> _type;
   }
 
   static private class FieldReaderWriter implements PropertyReader,
@@ -462,8 +464,8 @@
 
 
   static private Object _coerceType(
-    Object           value,
-    Class            type)
+    Object   value,
+    Class<?> type)
   {
     return Coercions.coerce(value, type);
   }
@@ -485,17 +487,18 @@
   }
 
 
-  private Class     _class;
+  private Class<?>  _class;
   private Object    _instance;
   private ClassInfo _classInfo;
 
-  static private Map _sIntrospectionInfo;
+  static private Map<Class<?>, ClassInfo> _sIntrospectionInfo;
   static private final ClassInfo _sEmptyClassInfo =
-     new ClassInfo(new HashMap(1), new HashMap(1));
+     new ClassInfo(new HashMap<String, PropertyReader>(1), 
+                   new HashMap<String, PropertyWriter>(1));
 
   static
   {
-    _sIntrospectionInfo = Collections.synchronizedMap(new WeakHashMap());
+    _sIntrospectionInfo = Collections.synchronizedMap(new WeakHashMap<Class<?>, ClassInfo>());
   }
 
   static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(IntrospectionAdapter.class);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java Fri Aug 11 09:24:50 2006
@@ -225,8 +225,8 @@
     if ((a == null) || (b == null))
       return (a == b);
 
-    Class ac = a.getClass();
-    Class bc = b.getClass();
+    Class<?> ac = a.getClass();
+    Class<?> bc = b.getClass();
     if (ac == bc)
       return a.equals(b);
 
@@ -248,11 +248,11 @@
     return a.equals(b);
   }
 
-  static private boolean _equalsForLong(long a, Number b, Class bc)
+  static private boolean _equalsForLong(long a, Number b, Class<?> bc)
   {
     if ((bc == Double.class) || (bc == Float.class))
     {
-      return (b.doubleValue() == ((double) a));
+      return (b.doubleValue() == a);
     }
 
     if (bc == BigDecimal.class)
@@ -269,7 +269,7 @@
   }
 
 
-  static private boolean _equalsForDouble(double a, Number b, Class bc)
+  static private boolean _equalsForDouble(double a, Number b, Class<?> bc)
   {
     if (bc == BigDecimal.class)
     {
@@ -285,7 +285,7 @@
   }
 
 
-  static private boolean _equalsForBigInteger(BigInteger a, Number b, Class bc)
+  static private boolean _equalsForBigInteger(BigInteger a, Number b, Class<?> bc)
   {
     if (bc == BigDecimal.class)
     {
@@ -301,7 +301,7 @@
   }
 
 
-  static private boolean _equalsForBigDecimal(BigDecimal a, Number b, Class bc)
+  static private boolean _equalsForBigDecimal(BigDecimal a, Number b, Class<?> bc)
   {
     if (bc == BigInteger.class)
     {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java Fri Aug 11 09:24:50 2006
@@ -59,7 +59,7 @@
    */
   public ConvertBoundValue(
     BoundValue wrapped,
-    Class      javaType)
+    Class<?>   javaType)
   {
     if (wrapped == null)
       throw new IllegalArgumentException();
@@ -125,7 +125,7 @@
     return javaType;
   }
 
-  private Class _getTargetType()
+  private Class<?> _getTargetType()
   {
     if (_class == null)
     {
@@ -144,6 +144,6 @@
 
   private BoundValue _wrapped;
   private String     _javaType;
-  private Class      _class;
+  private Class<?>   _class;
   private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(ConvertBoundValue.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/ELUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/ELUtils.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/ELUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/ELUtils.java Fri Aug 11 09:24:50 2006
@@ -24,7 +24,7 @@
 class ELUtils
 {
 
-  public static void getFunctions(List functions,
+  public static void getFunctions(List<FunctionToken> functions,
                                   String expression,
                                   int startIndex, int endIndex)
   {
@@ -114,7 +114,7 @@
 
   // gets a function name and prefix in the expression. searches backwards
   // from the location of the paren until the start index.
-  static private void _getFunction(List functions,
+  static private void _getFunction(List<FunctionToken> functions,
                                    String expression, 
                                    int start, 
                                    int parenIndex)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java Fri Aug 11 09:24:50 2006
@@ -17,6 +17,7 @@
 
 import java.util.AbstractMap;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
 
 import javax.faces.context.FacesContext;
@@ -200,7 +201,7 @@
 
 
   // Provides access to Image uri, width and height values.
-  private static final class ImageData extends AbstractMap
+  private static final class ImageData extends AbstractMap<String, Object>
   {
     public ImageData(
       Object uri,
@@ -213,11 +214,14 @@
       _height = height;
     }
 
-    public Set entrySet()
+    @SuppressWarnings("unchecked")
+    @Override
+    public Set<Map.Entry<String, Object>> entrySet()
     {
       return Collections.EMPTY_SET;
     }
 
+    @Override
     public Object get(Object key)
     {
       Object data = null;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java Fri Aug 11 09:24:50 2006
@@ -137,13 +137,16 @@
     return value;
   }
 
-  private final Map _dataMap = new AbstractMap()
+  private final Map<Object, Object> _dataMap = new AbstractMap<Object, Object>()
     {
-      public Set entrySet()
+      @SuppressWarnings("unchecked")
+      @Override
+      public Set<Map.Entry<Object, Object>> entrySet()
       {
         return Collections.EMPTY_SET;
       }
 
+      @Override
       public Object get(Object key)
       {
         UIXRenderingContext context = getRenderingContext();
@@ -152,13 +155,16 @@
       }
     };
 
-  private final Map _rootAttrsMap = new AbstractMap()
+  private final Map<Object, Object> _rootAttrsMap = new AbstractMap<Object, Object>()
     {
-      public Set entrySet()
+      @SuppressWarnings("unchecked")
+      @Override
+      public Set<Map.Entry<Object, Object>> entrySet()
       {
         return Collections.EMPTY_SET; // for now
       }
 
+      @Override
       public Object get(Object key)
       {
         UIXRenderingContext compositeContext = getRenderingContext();
@@ -186,7 +192,7 @@
       }
     };
 
-  private final class DOLList extends AbstractList implements DataObjectList
+  private final class DOLList extends AbstractList<DataObjectMap> implements DataObjectList
   {
     public DOLList(DataObjectList lst)
     {
@@ -197,6 +203,7 @@
       _lst = lst;
     }
 
+    @Override
     public int size()
     {
       return _lst.getLength();
@@ -212,7 +219,8 @@
       return _lst.getItem(i);
     }
 
-    public Object get(int i)
+    @Override
+    public DataObjectMap get(int i)
     {
       return new DataObjectMap(getItem(i));
     }
@@ -220,7 +228,7 @@
     private final DataObjectList _lst;
   }
 
-  private class DataObjectMap extends AbstractMap implements MutableDataObject
+  private class DataObjectMap extends AbstractMap<Object, Object> implements MutableDataObject
   {
     public DataObjectMap(DataObject dob)
     {
@@ -245,6 +253,7 @@
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object get(Object key)
     {
       UIXRenderingContext context = getRenderingContext();
@@ -254,6 +263,7 @@
       return value;
     }
 
+    @Override
     public Object put(Object key, Object value)
     {
       UIXRenderingContext context = getRenderingContext();
@@ -262,12 +272,15 @@
       return old;
     }
 
-    public Set entrySet()
+    @SuppressWarnings("unchecked")
+    @Override
+    public Set<Map.Entry<Object, Object>> entrySet()
     {
       return Collections.EMPTY_SET;
     }
 
-    public String toString()
+    @Override
+   public String toString()
     {
       return _dob.toString();
     }
@@ -291,6 +304,7 @@
       this(new DataSetImpl(dob, dol));
     }
 
+    @Override
     public Object get(Object key)
     {
       if (key instanceof Number)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java Fri Aug 11 09:24:50 2006
@@ -48,6 +48,7 @@
    * @param context the rendering context
    * @param node the current node
    */
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -59,17 +60,18 @@
   /**
    * Renders all attributes of the current node.
    */
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
     ) throws IOException
   {
-    Iterator attrs = node.getAttributeNames(context);
+    Iterator<AttributeKey> attrs = node.getAttributeNames(context);
     if (attrs != null)
     {
       while (attrs.hasNext())
       {
-        AttributeKey currKey = (AttributeKey) attrs.next();
+        AttributeKey currKey = attrs.next();
         if ((currKey != UIConstants.RENDERED_ATTR) &&
             (currKey != UIConstants.ANNOTATION_ATTR))
           renderAttribute(context,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLRendererFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLRendererFactory.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLRendererFactory.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLRendererFactory.java Fri Aug 11 09:24:50 2006
@@ -44,6 +44,7 @@
    * @deprecated only the version taking the RendererManager
    *             should be called.
    */ 
+  @Deprecated
   static public void registerSelf()
   {
     registerSelf(RendererManager.getDefaultRendererManager());
@@ -74,6 +75,7 @@
   /**
    * Returns the renderer for HTML elements.
    */
+  @Override
   public Renderer getRenderer(String elementName)
   {
     return HTMLElementRenderer.getRenderer();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java Fri Aug 11 09:24:50 2006
@@ -83,6 +83,7 @@
    * Returns the renderer to use on the bean.  Hardcoded
    * HTMLElementRenderer.
    */
+  @Override
   public Renderer getRenderer(
     UIXRenderingContext context,
     UINode           dataNode

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedText.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedText.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedText.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/EscapedText.java Fri Aug 11 09:24:50 2006
@@ -84,11 +84,13 @@
   /**
    * Returns the unescaped form of the String
    */
+  @Override
   public String toString()
   {
     return _baseText;
   }
 
+  @Override
   public boolean equals(
     Object other
     )
@@ -113,6 +115,7 @@
     }
   }
 
+  @Override
   public int hashCode()
   {
     return _baseText.hashCode();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/HTMLEscapes.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/HTMLEscapes.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/HTMLEscapes.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/io/HTMLEscapes.java Fri Aug 11 09:24:50 2006
@@ -701,7 +701,7 @@
     // Formerly used String.valueOf().  This version tests out
     // about 40% faster (and on systems where GC is going gonzo,
     // it should be massively better)
-    int i = (int) ch;
+    int i = ch;
     if (i > 10000)
     {
       buffer[offset++] = (char)('0' + (i / 10000));
@@ -753,7 +753,7 @@
     // Formerly used String.valueOf().  This version tests out
     // about 40% faster (and on systems where GC is going gonzo,
     // it should be massively better)
-    int i = (int) ch;
+    int i = ch;
     if (i > 10000)
     {
       out.write('0' + (i / 10000));

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java Fri Aug 11 09:24:50 2006
@@ -86,7 +86,7 @@
    * at least UIConstants.FACET_DEFAULT.
    * @see #supportsFacet
    */
-  public Iterator getSupportedFacets()
+  public Iterator<String> getSupportedFacets()
   {
     return Collections.singletonList(UIConstants.FACET_DEFAULT).iterator();
   }
@@ -97,7 +97,7 @@
    */
   public boolean supportsFacet(String facet)
   {
-    Iterator en = getSupportedFacets();
+    Iterator<String> en = getSupportedFacets();
     while (en.hasNext())
     {
       if (facet.equals(en.next()))

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelExtension.java Fri Aug 11 09:24:50 2006
@@ -75,6 +75,7 @@
   /**
    * Returns the id of this custom LookAndFeel.
    */
+  @Override
   public String getId()
   {
     return _id;
@@ -84,6 +85,7 @@
    * Returns the name of the look and feel family that this
    * LookAndFeelExtension belongs to.
    */
+  @Override
   public String getFamily()
   {
     return _family;
@@ -93,6 +95,7 @@
    * Implementation of LookAndFeel.getRendererManager() which
    * delegates to the base LookAndFeel.
    */
+  @Override
   public RendererManager getRendererManager()
   {
     return getRendererManager(UIConstants.FACET_DEFAULT);
@@ -102,6 +105,7 @@
    * Implementation of LookAndFeel.getRendererManager() which
    * delegates to the base LookAndFeel.
    */
+  @Override
   public RendererManager getRendererManager(String facet)
   {
     if (facet == null)
@@ -133,7 +137,8 @@
    * Implementation of LookAndFeel.getSupportedFacets() which
    * delegates to the base LookAndFeel.
    */
-  public Iterator getSupportedFacets()
+  @Override
+  public Iterator<String> getSupportedFacets()
   {
     return getBaseLookAndFeel().getSupportedFacets();
   }
@@ -164,11 +169,11 @@
     }
     else
     {
-      Iterator facets = getSupportedFacets();
+      Iterator<String> facets = getSupportedFacets();
 
       while (facets.hasNext())
       {
-        facet = (String)facets.next();
+        facet = facets.next();
         _registerRenderer(namespace, name, facet, renderer);
       }
     }
@@ -201,11 +206,11 @@
     }
     else
     {
-      Iterator facets = getSupportedFacets();
+      Iterator<String> facets = getSupportedFacets();
 
       while (facets.hasNext())
       {
-        facet = (String)facets.next();
+        facet = facets.next();
         _registerRenderer(namespace, name, facet, className);
       }
     }
@@ -284,6 +289,7 @@
       return _rendererManager;
     }
 
+    @Override
     public RendererFactory getFactory(String namespace)
     {
       // First, check to see if we have already created a
@@ -305,12 +311,14 @@
       return factory;
     }
 
+    @Override
     synchronized public void registerFactory(
        String namespace, RendererFactory factory)
     {
       _registerFactory(namespace, factory);
     }
 
+    @Override
     synchronized public void unregisterFactory(String namespace)
     {
       _proxyFactories = ArrayMap.remove(_proxyFactories, namespace);



Mime
View raw message