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 [4/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/LookAndFeelManager.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java Fri Aug 11 09:24:50 2006
@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 
-import org.apache.myfaces.trinidadinternal.share.config.Configuration;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIExtension;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.BaseDesktopUtils;
@@ -217,7 +216,7 @@
       int extensionCount = _extensions.size();
       for (int i = 0; i < extensionCount; i++)
       {
-        UIExtension extension = (UIExtension) _extensions.get(i);
+        UIExtension extension = _extensions.get(i);
         extension.registerSelf(laf);
       }
     }
@@ -260,7 +259,7 @@
 
         for (int i = 0; i < lafCount; i++)
         {
-          LookAndFeel laf = (LookAndFeel)_lafs.get(i);
+          LookAndFeel laf = _lafs.get(i);
           extension.registerSelf(laf);
         }
       }
@@ -308,12 +307,12 @@
   // Keep this private for now
   private LookAndFeelManager() {}
 
-  private ArrayList _scorersAndLafs = new ArrayList(20);
-  private ArrayList _extensions     = new ArrayList();
+  private ArrayList<Object>      _scorersAndLafs = new ArrayList<Object>(20);
+  private ArrayList<UIExtension> _extensions     = new ArrayList<UIExtension>();
 
   // A list (really, a set, but there's no ArraySet) of look-and-feels;
   // this does not contain duplicates, while _scorersAndLafs may
-  private ArrayList _lafs           = new ArrayList();
+  private ArrayList<LookAndFeel> _lafs           = new ArrayList<LookAndFeel>();
 
   private static LookAndFeelManager _sDefaultInstance;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java Fri Aug 11 09:24:50 2006
@@ -53,6 +53,7 @@
    * Implementation of LookAndFeelScorer that produces a Score
    * based on the required name and Agent information.
    */
+  @Override
   public Score scoreLookAndFeel(
     UIXRenderingContext context, 
     String lafName
@@ -87,6 +88,7 @@
   /**
    * @deprecated Subclassers should override scoreLookAndFeel() instead.
    */
+  @Deprecated
   public int score(
     UIXRenderingContext context,
     String           lafName

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java Fri Aug 11 09:24:50 2006
@@ -57,6 +57,7 @@
    * base LookAndFeelScorer to score everything other than
    * the look and feel family name.
    */
+  @Override
   public Score scoreLookAndFeel(
     UIXRenderingContext context,
     String lafName
@@ -94,6 +95,7 @@
       _nameScore = nameScore;
     }
 
+    @Override
     public int getNameScore()
     {
       return _nameScore;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreImpl.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreImpl.java Fri Aug 11 09:24:50 2006
@@ -59,6 +59,7 @@
   /**
    * Returns the score for the look and feel family name.
    */
+  @Override
   public int getNameScore()
   {
     return _nameScore;
@@ -67,6 +68,7 @@
   /**
    * Returns the score for the Agent type.
    */
+  @Override
   public int getAgentTypeScore()
   {
     return _agentTypeScore;
@@ -75,6 +77,7 @@
   /**
    * Returns the score for the Agent application.
    */
+  @Override
   public int getAgentApplicationScore()
   {
     return _agentApplicationScore;
@@ -83,6 +86,7 @@
   /**
    * Returns the score for the Agent version.
    */
+  @Override
   public int getAgentVersionScore()
   {
     return _agentVersionScore;
@@ -91,6 +95,7 @@
   /**
    * Returns the score for the Agent operating system.
    */
+  @Override
   public int getAgentOSScore()
   {
     return _agentOSScore;
@@ -100,6 +105,7 @@
    * Returns a discriminant score that is used as a tie-breaker
    * when multiple LookAndFeels produce the same score.
    */
+  @Override
   public int getDiscriminantScore()
   {
     return _discriminantScore;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreProxy.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreProxy.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/ScoreProxy.java Fri Aug 11 09:24:50 2006
@@ -43,6 +43,7 @@
   /**
    * Returns the score for the look and feel family name.
    */
+  @Override
   public int getNameScore()
   {
     return _baseScore.getNameScore();
@@ -51,6 +52,7 @@
   /**
    * Returns the score for the Agent type.
    */
+  @Override
   public int getAgentTypeScore()
   {
     return _baseScore.getAgentTypeScore();
@@ -59,6 +61,7 @@
   /**
    * Returns the score for the Agent application.
    */
+  @Override
   public int getAgentApplicationScore()
   {
     return _baseScore.getAgentApplicationScore();
@@ -67,6 +70,7 @@
   /**
    * Returns the score for the Agent version.
    */
+  @Override
   public int getAgentVersionScore()
   {
     return _baseScore.getAgentVersionScore();
@@ -75,6 +79,7 @@
   /**
    * Returns the score for the Agent operating system.
    */
+  @Override
   public int getAgentOSScore()
   {
     return _baseScore.getAgentOSScore();
@@ -84,6 +89,7 @@
    * Returns a discriminant score that is used as a tie-breaker
    * when multiple LookAndFeels produce the same score.
    */
+  @Override
   public int getDiscriminantScore()
   {
     return _baseScore.getDiscriminantScore();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.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/BaseLafUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java Fri Aug 11 09:24:50 2006
@@ -631,6 +631,7 @@
    * This method returns the modified URL for design time to pick up the resources
    * from ADF Faces jar, and dynamic resources from temp cache directory.
    */
+  @SuppressWarnings("unchecked")
   private static String _generateDesignTimeURL(
     UIXRenderingContext context,
     String baseURL
@@ -660,7 +661,7 @@
     }
     else
     {
-      Map appMap = external.getApplicationMap();
+      Map<String, Object> appMap = external.getApplicationMap();
       if (appMap.get("javax.servlet.context.tempdir")==null)
       {
         resourceDirectoryPath = baseURL.substring(baseURL.indexOf('/') + 1);
@@ -815,6 +816,7 @@
    * Encodes an array of key value pairs as a single value appended to
    * the baseName, if any;
    */
+  @SuppressWarnings("unchecked")
   public static String encodeCompoundKeyValues(
     Object[] keyValues
     )
@@ -833,7 +835,7 @@
     else
     {
         return ServletRequestParameters.encodeCompoundKeyValues(
-                                     (Collections.EMPTY_LIST).iterator(),
+                                     Collections.EMPTY_LIST.iterator(),
                                      keyValueSize);
       }
     }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLookAndFeel.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/BaseLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLookAndFeel.java Fri Aug 11 09:24:50 2006
@@ -40,6 +40,7 @@
   /**
    * Returns the RendererManager for this LookAndFeel.
    */
+  @Override
   public RendererManager getRendererManager()
   {
     return _rendererManager;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/FullyBufferedWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/FullyBufferedWriter.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/FullyBufferedWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/FullyBufferedWriter.java Fri Aug 11 09:24:50 2006
@@ -48,6 +48,7 @@
    *
    * @exception  IOException  If an I/O error occurs
    */
+  @Override
   public void write(int c) throws IOException
   {
     int nextChar = _nextChar;
@@ -72,6 +73,7 @@
    *
    * @exception  IOException  If an I/O error occurs
    */
+  @Override
   public void write(char cbuf[], int off, int len) throws IOException
   {
     if ((off < 0) || (off > cbuf.length) || (len < 0) ||
@@ -109,6 +111,7 @@
    *
    * @exception  IOException  If an I/O error occurs
    */
+  @Override
   public void write(String s, int off, int len) throws IOException
   {
     if (len == 0)
@@ -138,6 +141,7 @@
    *
    * @exception  IOException  If an I/O error occurs
    */
+  @Override
   public void flush() throws IOException
   {
   }
@@ -147,6 +151,7 @@
    *
    * @exception  IOException  If an I/O error occurs
    */
+  @Override
   public void close() throws IOException
   {
     if (_writer == null)
@@ -164,7 +169,7 @@
   public void reallyFlush() throws IOException
   {
     int nextChar = _nextChar;
-    ArrayList usedBuffers = _usedBuffers;
+    ArrayList<char[]> usedBuffers = _usedBuffers;
     if ((nextChar == 0) && (usedBuffers == null))
       return;
 
@@ -173,7 +178,7 @@
       int bufferCount = usedBuffers.size();
       for (int i = 0; i < bufferCount; i++)
       {
-        char[] usedBuffer = (char[]) usedBuffers.get(i);
+        char[] usedBuffer = usedBuffers.get(i);
         _writer.write(usedBuffer, 0, usedBuffer.length);
       }
     }
@@ -205,7 +210,7 @@
     if (_buffer != null)
     {
       if (_usedBuffers == null)
-        _usedBuffers = new ArrayList(5);
+        _usedBuffers = new ArrayList<char[]>(5);
       _usedBuffers.add(_buffer);
     }
     
@@ -218,7 +223,7 @@
 
   private ResponseWriter _writer;
 
-  private ArrayList _usedBuffers;
+  private ArrayList<char[]> _usedBuffers;
   private char[] _buffer;
   // Size of the above buffer, or zero if _buffer is null
   private int    _bufferSize;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/Icon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/Icon.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/Icon.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/Icon.java Fri Aug 11 09:24:50 2006
@@ -18,6 +18,7 @@
 import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
 
 import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeel;
 
 /**
  * Passed to an LafIconProvider by a look and feel
@@ -45,12 +46,12 @@
   *          Default should be true.
   */
   public Icon(
-    String       gifName,
-    Class        lookAndFeel,
-    NameResolver resolver,
-    boolean      isCoreColor,
-    boolean      isSymmetric,
-    boolean      isTransparent
+    String             gifName,
+    Class<LookAndFeel> lookAndFeel,
+    NameResolver       resolver,
+    boolean            isCoreColor,
+    boolean            isSymmetric,
+    boolean            isTransparent
   )
   {
     this(gifName, 
@@ -78,14 +79,14 @@
    * @param inlineStyle The inline style for the image icon
   */
   public Icon(
-    String       gifName,
-    Class        lookAndFeel,
-    NameResolver resolver,
-    boolean      isCoreColor,
-    boolean      isSymmetric,
-    boolean      isTransparent,
-    String       styleClass,
-    Style        inlineStyle
+    String             gifName,
+    Class<LookAndFeel> lookAndFeel,
+    NameResolver       resolver,
+    boolean            isCoreColor,
+    boolean            isSymmetric,
+    boolean            isTransparent,
+    String             styleClass,
+    Style              inlineStyle
   )
   {
     this(gifName, isCoreColor, isSymmetric, isTransparent);
@@ -133,7 +134,7 @@
     return _gifName;
   }
 
-  public Class getLookAndFeel()
+  public Class<LookAndFeel> getLookAndFeel()
   {
     return _lookAndFeel;
   }
@@ -184,7 +185,7 @@
   }
 
   private String _gifName ;
-  private Class _lookAndFeel ;
+  private Class<LookAndFeel> _lookAndFeel ;
   private NameResolver _resolver;
 
   // core is blue in blaf

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/IconKey.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/IconKey.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/IconKey.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/IconKey.java Fri Aug 11 09:24:50 2006
@@ -59,11 +59,13 @@
     return _keyIndex;
   }
 
+  @Override
   public boolean equals(Object o)
   {
     return this == o;
   }
 
+  @Override
   public int hashCode()
   {
     return _keyIndex;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/InstallLafIconProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/InstallLafIconProvider.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/InstallLafIconProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/InstallLafIconProvider.java Fri Aug 11 09:24:50 2006
@@ -129,6 +129,7 @@
   /**
    * Returns the URI to the icon indentified by the icon key
    */
+  @Override
   public  String getIconURI(
     UIXRenderingContext context,
     IconKey          iconKey

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/RawTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/RawTextRenderer.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/RawTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/RawTextRenderer.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
@@ -74,6 +75,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -87,6 +89,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void renderBetweenIndexedChildren(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/SwitcherRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/SwitcherRenderer.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/SwitcherRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/SwitcherRenderer.java Fri Aug 11 09:24:50 2006
@@ -40,6 +40,7 @@
     return STATE_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/TextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TextRenderer.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/TextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TextRenderer.java Fri Aug 11 09:24:50 2006
@@ -41,6 +41,7 @@
   {
   }
 
+  @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/TreeWalkerUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TreeWalkerUtils.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/TreeWalkerUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/TreeWalkerUtils.java Fri Aug 11 09:24:50 2006
@@ -141,7 +141,7 @@
     }
 
     // Walk the named children
-    Iterator e;
+    Iterator<String> e;
 
     // For switcher beans, only walk the "CHILD_NAME_ATTR" bean; a
     // SingleItemIterator does the trick quite well...
@@ -152,7 +152,7 @@
       if (name == null)
         e = null;
       else
-        e = Collections.singletonList(name).iterator();
+        e = Collections.singletonList((String)name).iterator();
     }
     else
     {
@@ -163,7 +163,7 @@
     {
       while (e.hasNext())
       {
-        String next = (String) e.next();
+        String next = e.next();
 
         UINode currNamedChild =
                     ancestor.getNamedChild(context, next);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/AllMessageIterator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/AllMessageIterator.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/desktop/AllMessageIterator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/AllMessageIterator.java Fri Aug 11 09:24:50 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 
@@ -30,7 +31,7 @@
  * @todo Iterate through global messages then messages that don't have labels,
  *       finally messages with labels.
  */
-class AllMessageIterator implements java.util.Iterator
+class AllMessageIterator implements Iterator<MessageWrapper>
 {
   /**
    * Creates an {@Link Java.Util.Iterator} that will iterate through all
@@ -56,6 +57,7 @@
    *                    allMessages is false and skipGlobals is true,
    *                    no messages will ever be returned.
    */
+  @SuppressWarnings("unchecked")
   public AllMessageIterator(FacesContext fContext,
                             boolean allMessages,
                             boolean skipGlobals)
@@ -84,13 +86,13 @@
     return _nextItr();
   }
 
-  public Object next()
+  public MessageWrapper next()
   {
     MessageWrapper msg = null;
 
     if (_itr.hasNext() || _nextItr())
     {
-      FacesMessage fm = (FacesMessage) _itr.next();
+      FacesMessage fm = _itr.next();
       msg = new MessageWrapper(fm, _currentId);
     }
     return msg;
@@ -101,6 +103,7 @@
     _itr.remove();
   }
 
+  @SuppressWarnings("unchecked")
   private boolean _nextItr()
   {
     if (_allMsg)
@@ -111,7 +114,7 @@
 
       while (_clients.hasNext())
       {
-        _currentId = (String) _clients.next();
+        _currentId = _clients.next();
         if (_currentId != null)
         {
           // Set the current Iterator to the component message Iterator
@@ -130,11 +133,12 @@
     return false;
   }
 
-  private static final Iterator _EMPTY_ITERATOR =
-    Collections.EMPTY_LIST.iterator();
-  private FacesContext _fContext;
-  private Iterator     _clients;
-  private Iterator     _itr;
-  private String       _currentId;
-  private boolean      _allMsg = true;
+  private static final Iterator<FacesMessage> _EMPTY_ITERATOR = 
+    Collections.unmodifiableList(Arrays.asList(new FacesMessage[0])).iterator();
+  
+  private FacesContext           _fContext;
+  private Iterator<String>       _clients;
+  private Iterator<FacesMessage> _itr;
+  private String                 _currentId;
+  private boolean                _allMsg = true;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.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/desktop/ApplicationSwitcherRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ApplicationSwitcherRenderer.java Fri Aug 11 09:24:50 2006
@@ -86,6 +86,7 @@
 
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -120,7 +121,7 @@
     super.renderContent(context, node);
   }
 
-
+  @Override
   protected Object getNodeName(
           UIXRenderingContext context,
           UINode           node
@@ -132,6 +133,7 @@
   /**
    * Returns the value associated with the selected value attribute
    */
+  @Override
   protected String getSelectedValue(UIXRenderingContext context, UINode node)
   {
     BoundValue bv = new MenuChoiceSelectedValueBoundValue(
@@ -139,7 +141,7 @@
     return (String) bv.getValue(context);
   }
 
-
+  @Override
   protected void selectItemsRenderContent(
     UIXRenderingContext context,
     UINode           node
@@ -152,6 +154,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -246,6 +249,7 @@
    * @param context the rendering context
    * @param node the current UINode
    */
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -413,6 +417,7 @@
       super(component);
     }
 
+    @Override
     protected boolean setNewPath(
       UIXNavigationHierarchy  menuComponent
     )
@@ -422,6 +427,7 @@
                                            menuComponent.getFocusRowKey());
     }
 
+    @Override
     protected UIComponent getStamp(
       UIXNavigationHierarchy   menuComponent
       )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.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/desktop/BaseDesktopLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopLookAndFeel.java Fri Aug 11 09:24:50 2006
@@ -43,6 +43,7 @@
    * Returns the id for the desktop implementation of the Base
    * Look And Feel: "base.desktop".
    */
+  @Override
   public String getId()
   {
     return BaseDesktopConstants.BASE_DESKTOP_ID;
@@ -52,6 +53,7 @@
    * Returns the family for the Base
    * Look And Feel: "base".
    */
+  @Override
   public String getFamily()
   {
     return "base";
@@ -65,6 +67,7 @@
     return "META-INF/adf/styles/base-desktop.xss";
   }
 
+  @Override
   public RendererManager getRendererManager(String facet)
   {
     if (FACET_PRINTABLE.equals(facet))
@@ -87,7 +90,9 @@
     return super.getRendererManager(facet);
   }
 
-  public Iterator getSupportedFacets()
+  @SuppressWarnings("unchecked")
+  @Override
+  public Iterator<String> getSupportedFacets()
   {
     if (_SUPPORTED_FACETS!=null)
     {
@@ -129,11 +134,13 @@
     }
   }
 
+  @Override
   protected RendererFactory getDefaultFactory()
   {
     return _FACTORY;
   }
 
+  @Override
   protected RendererFactory getFactory(String facet)
   {
     if (FACET_PRINTABLE.equals(facet))

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.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/desktop/BaseDesktopUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java Fri Aug 11 09:24:50 2006
@@ -81,6 +81,7 @@
             null);
     }
 
+    @Override
     public Score scoreLookAndFeel(
       UIXRenderingContext context,
       String           lafName
@@ -94,6 +95,7 @@
       {
         score = new ScoreProxy(score)
                     {
+                      @Override
                       public int getAgentApplicationScore()
                       {
                         return Score.NO_MATCH;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BorderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BorderLayoutRenderer.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/desktop/BorderLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BorderLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,6 +31,7 @@
    * Returns the default marign indent to use if no CELL_PADDING_ATTR
    * is specified
    */
+  @Override
   protected int getDefaultMarginIndent(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BreadCrumbsRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BreadCrumbsRenderer.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/desktop/BreadCrumbsRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BreadCrumbsRenderer.java Fri Aug 11 09:24:50 2006
@@ -27,7 +27,7 @@
 public class BreadCrumbsRenderer 
        extends org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.BreadCrumbsRenderer
 {
-
+  @Override
   protected boolean renderLastChild(
     UIXRenderingContext context, 
     UINode           node)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.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/desktop/ButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java Fri Aug 11 09:24:50 2006
@@ -68,6 +68,7 @@
    * @see #renderContent(UIXRenderingContext,UINode)
    * @see #renderImageContent(UIXRenderingContext,UINode,ImageProviderResponse)
    */
+  @Override
   protected final void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -85,6 +86,7 @@
    * @param node the node to be rendered
    * @throws IOException
    */
+  @Override
   protected final void postrender(
     UIXRenderingContext context,
     UINode node
@@ -104,6 +106,7 @@
    * @param node the node to be rendered
    * @throws IOException
    */
+  @Override
   protected final void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -170,6 +173,7 @@
    * image to render
    * @throws IOException
    */
+  @Override
   public final void render(UIXRenderingContext context, UINode node)
     throws IOException
   {
@@ -228,6 +232,8 @@
     {
       return _ALTERNATE_RENDERER;
     }
+    
+  @Override
   protected Object getOnClick(
     UIXRenderingContext context,
     UINode           node
@@ -276,6 +282,7 @@
     return chainedScript;
   }
 
+  @Override
   protected Object getText(
     UIXRenderingContext context,
     UINode node
@@ -293,6 +300,7 @@
   /**
    * Override to provide defaults
    */
+  @Override
   protected Object getStyleClass(
     UIXRenderingContext context,
     UINode           node
@@ -304,6 +312,7 @@
   }
 
   // Returns the vertical alignment
+  @Override
   protected Object getVAlign(UIXRenderingContext context, UINode node)
   {
     // This is kind of a hack to address bug #2047577
@@ -339,7 +348,7 @@
     return align;
   }
 
-
+  @Override
   protected void renderButtonAccessKey(
     UIXRenderingContext context,
     UINode           node
@@ -447,9 +456,9 @@
       getFontStyle(context, node, style, inlineStyle, styleName);
     int fontSize =
       getFontSize(context, node, style, inlineStyle, styleName);
-    Collection fontFamilies =
+    Collection<Object> fontFamilies =
       getFontFamilies(context, node, style, styleName);
-    Collection inlineFontFamilies =
+    Collection<Object> inlineFontFamilies =
       getFontFamilies(context, node, inlineStyle, null);
     MutableFontProxy font = new MutableFontProxy(null, fontStyle, fontSize);
 
@@ -483,8 +492,8 @@
     ImageProvider    provider,
     ImageProviderRequest request,
     MutableFontProxy font,
-    Collection   fontFamilies,
-    Collection   inlineFontFamilies
+    Collection<Object> fontFamilies,
+    Collection<Object> inlineFontFamilies
     )
   {
     ImageContext imageContext = context.getImageContext();
@@ -493,7 +502,7 @@
     // First, loop through inline font families, if we've got any
     if (inlineFontFamilies != null)
     {
-      Iterator inlineFontFamiliesIterator = inlineFontFamilies.iterator();
+      Iterator<Object> inlineFontFamiliesIterator = inlineFontFamilies.iterator();
       while(inlineFontFamiliesIterator.hasNext())
       {
         String family = (String)inlineFontFamiliesIterator.next();
@@ -509,7 +518,7 @@
     // Next, try the font families defined by the style class
     if (fontFamilies != null)
     {
-      Iterator fontFamiliesIterator = fontFamilies.iterator();
+      Iterator<Object> fontFamiliesIterator = fontFamilies.iterator();
       while(fontFamiliesIterator.hasNext())
       {
         String family = (String)fontFamiliesIterator.next();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/CellFormatRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/CellFormatRenderer.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/desktop/CellFormatRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/CellFormatRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,6 +31,7 @@
   /**
    * Renders attributes of the current 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/desktop/ColorPaletteRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.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/desktop/ColorPaletteRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java Fri Aug 11 09:24:50 2006
@@ -44,6 +44,7 @@
 
 public class ColorPaletteRenderer extends HtmlLafRenderer
 {
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode node) throws IOException
@@ -52,18 +53,19 @@
     BaseDesktopUtils.addLib(context, "RGBColorFormat()");
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode node) throws IOException
   {
-    List colorData = _getColors(context, node, COLOR_DATA_ATTR);
+    List<Color> colorData = _getColors(context, node, COLOR_DATA_ATTR);
     if (colorData == null)
     {
-      colorData = (List)
+      colorData = 
         ColorPaletteUtils.getColorPaletteMap().get("default49");
     }
 
-    List customColorData = _getColors(context, node, CUSTOM_COLOR_DATA_ATTR);
+    List<Color> customColorData = _getColors(context, node, CUSTOM_COLOR_DATA_ATTR);
 
     int width = getWidth(context, node);
     int height = getHeight(context, node);
@@ -83,7 +85,7 @@
   private void _renderColorPalette(
     UIXRenderingContext context,
     UINode node,
-    List colorData,
+    List<Color> colorData,
     int width,
     int height) throws IOException
   {
@@ -204,7 +206,7 @@
         {
           //colorData/customColorData binding is always expected to resolve to
           //  a java.util.List of java.awt.Color. An error otherwise.
-          color = (Color) colorData.get(index);
+          color = colorData.get(index);
         }
         else
         {
@@ -320,6 +322,7 @@
     writer.endElement("table");
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode node)
@@ -350,6 +353,7 @@
                              "_cfbs(event)");
   }
 
+  @Override
   protected Object getOnClick(
     UIXRenderingContext  context,
     UINode            node)
@@ -395,7 +399,8 @@
                                      true);
   }
 
-  private static List _getColors(
+  @SuppressWarnings("unchecked")
+  private static List<Color> _getColors(
     UIXRenderingContext  context,
     UINode            node,
     AttributeKey     attributeKey
@@ -408,7 +413,7 @@
     }
     //If not Color[], colorData/customColorData binding is always expected to
     //  resolve to java.util.List of java.awt.Color. An error otherwise.
-    return (List) attribValue;
+    return (List<Color>) attribValue;
   }
 
   private static final String _CELL_SIZE = "11";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentContainerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentContainerRenderer.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/desktop/ContentContainerRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentContainerRenderer.java Fri Aug 11 09:24:50 2006
@@ -38,6 +38,7 @@
   /**
    * Implementation of ElementRenderer.getName();
    */
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -49,6 +50,7 @@
   /**
    * Override of BaseRenderer.renderAttributes().
    */
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -67,6 +69,7 @@
   /**
    * Returns the style class for the content container
    */
+  @Override
   protected Object getStyleClass(
     UIXRenderingContext context,
     UINode           node
@@ -114,6 +117,7 @@
    * Override of BaseRenderer.renderContent() which renders
    * the contentContainer's chrome around the child contents.
    */
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -131,6 +135,7 @@
   /**
    * Gets the contentContainer's header text.
    */
+  @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/desktop/ContentFooterRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentFooterRenderer.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/desktop/ContentFooterRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ContentFooterRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,6 +31,7 @@
  */
 public class ContentFooterRenderer extends HtmlLafRenderer
 {
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -39,6 +40,7 @@
     super.renderAttributes(context, node);
   }
 
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -61,7 +63,7 @@
     renderStyleClassAttribute( context, CONTENT_FOOTER_CHILDREN_STYLE_CLASS);
   }
 
-
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -82,7 +84,7 @@
     super.postrender(context, node); 
   }
     
-  
+  @Override
   protected String getElementName(UIXRenderingContext context, UINode node)
   {
     return DIV_ELEMENT;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/FooterRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/FooterRenderer.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/desktop/FooterRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/FooterRenderer.java Fri Aug 11 09:24:50 2006
@@ -33,6 +33,7 @@
  */
 public class FooterRenderer extends HtmlLafRenderer
 {
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -41,6 +42,7 @@
     renderStyleClassAttribute(context, FOOTER_STYLE_CLASS);
   }
 
+  @Override
   protected void renderBetweenIndexedChildren(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -50,6 +52,7 @@
     writer.writeText(_SEPARATOR, null);
   }  
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -100,6 +103,7 @@
     super.postrender(context, node);
   }
 
+  @Override
   protected String getElementName(UIXRenderingContext context, UINode node)
   {
     return DIV_ELEMENT;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.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/desktop/GeneratedImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java Fri Aug 11 09:24:50 2006
@@ -69,6 +69,7 @@
    * as the title attribute; instead we write shortDesc as the alt text of the
    * image.
    */
+  @Override
   protected void renderShortDesc(UIXRenderingContext context, UINode node)
   {
   }
@@ -197,6 +198,7 @@
       writer.endElement("a");
   }
 
+  @Override
   protected Object getText(
     UIXRenderingContext context,
     UINode           node
@@ -205,6 +207,7 @@
     return node.getAttributeValue(context, TEXT_ATTR);
   }
 
+  @Override
   protected Object getShortDesc(
     UIXRenderingContext context,
     UINode           node
@@ -417,7 +420,8 @@
     return _DEFAULT_FONT_SIZE;
   }
 
-  static protected Collection getFontFamilies(
+  @SuppressWarnings("unchecked")
+  static protected Collection<Object> getFontFamilies(
     UIXRenderingContext context,
     UINode node,
     Style  style,
@@ -428,11 +432,11 @@
     {
       if(_parseValue(style, null, Style.FONT_FAMILIES_KEY) instanceof Collection)
       {
-        return  (Collection)_parseValue(style, null, Style.FONT_FAMILIES_KEY);
+        return  (Collection<Object>)_parseValue(style, null, Style.FONT_FAMILIES_KEY);
       }
       else
       {
-        Collection parsedValueList = new ArrayList();
+        Collection<Object> parsedValueList = new ArrayList<Object>();
         parsedValueList.add(_parseValue(style, null, Style.FONT_FAMILIES_KEY));
         return  parsedValueList;
       }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.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/desktop/GlobalButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java Fri Aug 11 09:24:50 2006
@@ -40,6 +40,7 @@
   /**
    *
    */
+  @Override
   protected void prerender(UIXRenderingContext context, UINode node)
     throws IOException
   {
@@ -97,6 +98,7 @@
     writer.endElement(LINK_ELEMENT);
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -109,6 +111,7 @@
    * @todo added basic fireAction support, didn't do the part commented out
    * about _getPartialChangeScript if action is null
    */
+  @Override
   protected Object getOnClick(
     UIXRenderingContext context,
     UINode           node
@@ -224,6 +227,7 @@
     return (selectedAttr || linkProp);
   }
 
+  @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/desktop/GlobalHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.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/desktop/GlobalHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.java Fri Aug 11 09:24:50 2006
@@ -43,6 +43,7 @@
  */
 public class GlobalHeaderRenderer extends HtmlLafRenderer
 {
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -51,6 +52,7 @@
     return DIV_ELEMENT;
   }
 
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -65,6 +67,7 @@
   /**
    *
    */
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -96,6 +99,7 @@
     }
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -141,6 +145,7 @@
   /**
    *
    */
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -162,6 +167,7 @@
     renderRelatedLinksBlockEnd(context);
   }
   
+  @Override
   protected void renderIndexedChild(
     UIXRenderingContext context,
     UINode           node,
@@ -213,6 +219,7 @@
    * Override of renderBetweenIndexedChildren() which 
    * renders the separator Icon.
    */
+    @Override
   protected void renderBetweenIndexedChildren(
     UIXRenderingContext context,
     UINode           node
@@ -239,6 +246,7 @@
    * Override of getStyleClass() which forces style class
    * to OraGlobalHeader.
    */
+  @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/desktop/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/HeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java Fri Aug 11 09:24:50 2006
@@ -54,6 +54,7 @@
     return false;
   }
 
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -65,6 +66,7 @@
       _prerender(context, node);
   }
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -255,7 +257,7 @@
     // using float to indent in ie on windows, but that means you 
     // need to clear after the header or you get strange behavior
     if ( HtmlLafRenderer.isIE(context) &&
-         context.getAgent().OS_WINDOWS == context.getAgent().getAgentOS())
+         TrinidadAgent.OS_WINDOWS == context.getAgent().getAgentOS())
     {
       writer.startElement(DIV_ELEMENT, null);
       writer.writeAttribute("style","clear:both", null);
@@ -327,12 +329,15 @@
   private static final String _QUICK_LINKS_RETURN_TOP_TEXT =
                                     "af_panelPage.QUICK_LINKS_RETURN_TOP";
 
+  // -= Simon Lessard =-
+  // TODO: Never read locally as of 2006-08-09. Remove permanently if
+  //       no problem show up.
   // Integer of the indent level to show QuickLinks at
-  private static final String _QUICKLINKS_INDENT_LEVEL = "quickLinksIndent";
+  //private static final String _QUICKLINKS_INDENT_LEVEL = "quickLinksIndent";
 
   // FALSE if the first QuickLinks header has been rendered
-  private static final String _QUICK_LINKS_FIRST_HEADER_PROPERTY =
-    "quickLinksFirstHeader";
+  //private static final String _QUICK_LINKS_FIRST_HEADER_PROPERTY =
+  //  "quickLinksFirstHeader";
 
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.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/desktop/HtmlLafRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlLafRenderer.java Fri Aug 11 09:24:50 2006
@@ -25,7 +25,6 @@
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 import org.apache.myfaces.trinidadinternal.ui.laf.base.LafIconProvider;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer;
@@ -90,6 +89,7 @@
   /**
    * Renders a transparent gif using a script to save space.
    */
+  @Override
   protected void renderTransparent(
     UIXRenderingContext context,
     String           width,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/HtmlRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HtmlRenderer.java Fri Aug 11 09:24:50 2006
@@ -28,6 +28,7 @@
   /**
    * Returns the name of the language attribute
    */
+  @Override
   protected String getLangAttrName(
     UIXRenderingContext context)
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.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/desktop/IconButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/IconButtonRenderer.java Fri Aug 11 09:24:50 2006
@@ -43,6 +43,7 @@
   abstract String getIconName();
 
   // Returns the elmenet name - "a"
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -53,6 +54,7 @@
   }
 
   // Renders the link attributes
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -80,6 +82,7 @@
   }
 
   // Renders the icon
+  @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/desktop/MenuListRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MenuListRenderer.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/desktop/MenuListRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MenuListRenderer.java Fri Aug 11 09:24:50 2006
@@ -39,7 +39,7 @@
  */
 public class MenuListRenderer extends HtmlLafRenderer
 {
-
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -147,6 +147,7 @@
 
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -186,7 +187,7 @@
     super.renderContent(context, node);
   }
 
-
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node
@@ -212,6 +213,7 @@
     super.postrender( context, node);
   }
 
+  @Override
   protected void renderIndexedChild(
     UIXRenderingContext context,
     UINode           node,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxRenderer.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/desktop/MessageBoxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxRenderer.java Fri Aug 11 09:24:50 2006
@@ -40,6 +40,7 @@
  */
 public class MessageBoxRenderer extends HtmlLafRenderer
 {
+  @Override
   public void render(UIXRenderingContext context, UINode node) throws IOException
   {
     Object globalOnlyAttr = getAttributeValue(context, node,
@@ -61,6 +62,7 @@
     }
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -72,6 +74,7 @@
   /**
    * Returns the messageBox's style class.
    */
+  @Override
   protected Object getStyleClass(
     UIXRenderingContext context,
     UINode           node
@@ -101,6 +104,7 @@
 
 
   // based on oracle.desktop.MessageBoxRenderer.renderChildren
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode node
@@ -119,7 +123,7 @@
     // the messageBox, even though it uses a HeaderBean.
     // map the resource keys that are used in HideShowBean to the
     // keys we need to use in this renderer.
-    Map originalResourceKeyMap = context.getSkinResourceKeyMap();
+    Map<String, String> originalResourceKeyMap = context.getSkinResourceKeyMap();
     try
     {
       context.setSkinResourceKeyMap(_RESOURCE_KEY_MAP);
@@ -184,13 +188,13 @@
     String summary;
     String detail;
 
-    Iterator itr = (isGlobal
+    Iterator<MessageWrapper> itr = (isGlobal
                     ? MessageBoxUtils.sGetGlobalsIterator(context)
                     : MessageBoxUtils.sGetClientsIterator(context));
 
     while (itr.hasNext())
     {
-      MessageWrapper msg = (MessageWrapper) itr.next();
+      MessageWrapper msg = itr.next();
 
       if (useList)
         writer.startElement("li", null);
@@ -277,7 +281,7 @@
     if (label != null)
     {
       // If the text is null, no need to actually collect these values
-      anchor = (String) MessageUtils.getAnchor(msg.getId().toString());
+      anchor = MessageUtils.getAnchor(msg.getId().toString());
       if (anchor != null)
         anchor = "#"+anchor;
 
@@ -303,10 +307,12 @@
     "af_messages.LIST_FORMAT_private";
 
   // we need a  value map since we are using a HeaderBean.
-  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>();
+    
     // translation keys
     _RESOURCE_KEY_MAP.put("af_panelHeader.INFORMATION",
                               "af_messages.INFORMATION");

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxUtils.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/desktop/MessageBoxUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/MessageBoxUtils.java Fri Aug 11 09:24:50 2006
@@ -37,10 +37,10 @@
     // This doesn't seem to work if there is a global message
     // return context.getFacesContext().getMaximumSeverity();
     FacesMessage.Severity max = FacesMessage.SEVERITY_INFO;
-    Iterator itr = sGetIterator(context, true);
+    Iterator<MessageWrapper> itr = sGetIterator(context, true);
     while (itr.hasNext())
     {
-      FacesMessage nxt = (FacesMessage) itr.next();
+      FacesMessage nxt = itr.next();
       FacesMessage.Severity sev = nxt.getSeverity();
       if (sev.compareTo(max) > 0)
       {
@@ -73,11 +73,11 @@
     boolean allMessages
     )
   {
-    Iterator itr = sGetIterator(context, allMessages);
+    Iterator<MessageWrapper> itr = sGetIterator(context, allMessages);
     return itr.hasNext();
   }
 
-  public static Iterator sGetIterator(
+  public static Iterator<MessageWrapper> sGetIterator(
     UIXRenderingContext context,
     boolean allMessages)
   {
@@ -85,13 +85,13 @@
                                   allMessages, false);
   }
 
-  public static Iterator sGetGlobalsIterator(
+  public static Iterator<MessageWrapper> sGetGlobalsIterator(
     UIXRenderingContext context)
   {
     return new AllMessageIterator(context.getFacesContext(), false, false);
   }
 
-  public static Iterator sGetClientsIterator(
+  public static Iterator<MessageWrapper> sGetClientsIterator(
     UIXRenderingContext context)
   {
     return new AllMessageIterator(context.getFacesContext(), true, true);
@@ -115,7 +115,7 @@
   {
     boolean isMult = false;
     // First find out if we have multiple messages.
-    Iterator itr = sGetIterator(context, allMessages);
+    Iterator<MessageWrapper> itr = sGetIterator(context, allMessages);
     for (int c = 0; (!isMult) && itr.hasNext(); c++)
     {
       itr.next();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/NavigationBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationBarRenderer.java Fri Aug 11 09:24:50 2006
@@ -34,6 +34,7 @@
   /**
    * Writes the separator between two elements
    */
+  @Override
   protected void renderItemSpacer(
     UIXRenderingContext context
     ) throws IOException
@@ -46,6 +47,7 @@
    * returns true if the navigation bar requires a form in order to
    * submit
    */
+  @Override
   protected boolean requiresForm(
     UIXRenderingContext context
     )

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationPathRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/NavigationPathRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationPathRenderer.java Fri Aug 11 09:24:50 2006
@@ -27,7 +27,7 @@
 public class NavigationPathRenderer 
        extends org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.NavigationPathRenderer
 {
-
+  @Override
   protected boolean renderLastChild(
     UIXRenderingContext context, 
     UINode           node)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationTreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationTreeRenderer.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/desktop/NavigationTreeRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/NavigationTreeRenderer.java Fri Aug 11 09:24:50 2006
@@ -33,31 +33,34 @@
  */
 public class NavigationTreeRenderer extends TreeRenderer
 {
-
+  @Override
   protected RowKeySet getExpandedRowKeys(UIXHierarchy tree)
   {
     return ((UIXNavigationTree)tree).getDisclosedRowKeys();    
   }
   
-  protected Map getSelectedPaths(Object focusRowKey)
+  @Override
+  protected Map<Object, Boolean> getSelectedPaths(Object focusRowKey)
   {
     if ( focusRowKey == null)
-      return new HashMap(0);
+      return new HashMap<Object, Boolean>(0);
 
     // TODO method must be passed the component so that
     // proper APIs can be used instead of casting to List:
-    List focusPath = (List) focusRowKey;
-    Map selectedPaths = new HashMap(focusPath.size());
+    List<?> focusPath = (List<?>) focusRowKey;
+    Map<Object, Boolean> selectedPaths = 
+      new HashMap<Object, Boolean>(focusPath.size());
 
     for ( int i = 0; i < focusPath.size(); i++)
     {
-      List focusSubPath = focusPath.subList(0,i + 1);
+      List<?> focusSubPath = focusPath.subList(0,i + 1);
       selectedPaths.put(focusSubPath, Boolean.TRUE);
     }
 
     return selectedPaths;
   }
 
+  @Override
   protected UINode getIcon()
   {
     return null;
@@ -65,6 +68,7 @@
 
 
   // return whether to continue with rendering
+  @Override
   protected boolean setInitialPath(
     UIXRenderingContext context,
     UINode           node,
@@ -85,14 +89,16 @@
    * @param key
    * @return String , key mapped to a new String.
    */
+  @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_tree.DISABLED_COLLAPSE_TIP",
                               "af_navigationTree.DISABLED_COLLAPSE_TIP");
     _RESOURCE_KEY_MAP.put("af_tree.COLLAPSE_TIP",

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageHeaderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageHeaderLayoutRenderer.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/desktop/PageHeaderLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageHeaderLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -30,6 +30,7 @@
  */
 public class PageHeaderLayoutRenderer extends HtmlLafRenderer
 {
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -488,8 +489,7 @@
     renderNamedChild(context, node, globalHeader, NAVIGATION2_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/desktop/PageLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.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/desktop/PageLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -23,7 +23,6 @@
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
 import org.apache.myfaces.trinidadinternal.ui.collection.UINodeList;
 import org.apache.myfaces.trinidadinternal.ui.composite.ContextPoppingUINode;
-import org.apache.myfaces.trinidadinternal.ui.composite.ContextPropertyUINode;
 import org.apache.myfaces.trinidadinternal.ui.composite.RootAttributeBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.composite.RootAttributeMap;
 import org.apache.myfaces.trinidadinternal.ui.composite.RootChildBoundValue;
@@ -31,19 +30,14 @@
 import org.apache.myfaces.trinidadinternal.ui.composite.UINodeRenderer;
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.AndBoundValue;
-import org.apache.myfaces.trinidadinternal.ui.data.bind.ComparisonBoundValue;
-import org.apache.myfaces.trinidadinternal.ui.data.bind.FixedBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.IfBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.NotBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.OrBoundValue;
-import org.apache.myfaces.trinidadinternal.ui.data.bind.StringExistsBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.SkinTranslatedBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.TreeWalker;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.TreeWalkerUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.UseAccessibilityBoundValue;
-import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.RepeatIdContextPropertyUINode;
 import org.apache.myfaces.trinidadinternal.ui.path.Path;
-import org.apache.myfaces.trinidadinternal.ui.path.PathImpl;
 
 
 /**
@@ -59,7 +53,7 @@
   private static final String _SKIP_PAST_NAVIGATION = "af_panelPage.SKIP_PAST_NAVIGATION";
   private static final String _ORA_HIDE_SKIP_NAVI_TEXT = "p_OraHideSkipNaviText";
 
-
+  @Override
   protected UINode getRenderingUINode(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuBarRenderer.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/desktop/PageMenuBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuBarRenderer.java Fri Aug 11 09:24:50 2006
@@ -33,7 +33,7 @@
  */
 public class PageMenuBarRenderer extends GlobalHeaderRenderer
 {
-
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -80,6 +80,7 @@
    * Checks to see whether the globalHeader is empty (contains no
    * indexed children).
    */
+  @Override
   protected boolean isEmpty(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuListRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuListRenderer.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/desktop/PageMenuListRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuListRenderer.java Fri Aug 11 09:24:50 2006
@@ -33,7 +33,7 @@
  */
 public class PageMenuListRenderer extends MenuListRenderer
 {
-
+  @Override
   protected UIXHierarchy getHierarchyBase(
     UIXRenderingContext context,
     UINode           node
@@ -43,6 +43,7 @@
     return (UIXPage) pageNode.getUIComponent();
   }
 
+  @Override
   protected UINode getStamp(
     UIXRenderingContext context,
     UINode           node
@@ -52,6 +53,7 @@
     return getNamedChild(context, pageNode, NODE_STAMP_CHILD);
   }
 
+  @Override
   protected boolean setNewPath(
     UIXRenderingContext context,
     UINode           node,
@@ -59,6 +61,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/desktop/PageMenuTabsRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuTabsRenderer.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/desktop/PageMenuTabsRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageMenuTabsRenderer.java Fri Aug 11 09:24:50 2006
@@ -19,7 +19,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;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.PageRendererUtils;
@@ -33,7 +32,7 @@
 public class PageMenuTabsRenderer extends
   org.apache.myfaces.trinidadinternal.ui.laf.simple.desktop.TabBarRenderer
 {
-
+  @Override
   protected UIXHierarchy getHierarchyBase(
     UIXRenderingContext context,
     UINode           node
@@ -43,6 +42,7 @@
     return (UIXPage) pageNode.getUIComponent();
   }
 
+  @Override
   protected UINode getStamp(
     UIXRenderingContext context,
     UINode           node
@@ -52,6 +52,7 @@
     return getNamedChild(context, pageNode, NODE_STAMP_CHILD);
   }
 
+  @Override
   protected boolean setNewPath(
     UIXRenderingContext context,
     UINode           node,
@@ -59,6 +60,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/desktop/PageNavigationPathRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/PageNavigationPathRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationPathRenderer.java Fri Aug 11 09:24:50 2006
@@ -27,7 +27,7 @@
 public class PageNavigationPathRenderer 
        extends org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.PageNavigationPathRenderer
 {
-
+  @Override
   protected boolean renderLastChild(
     UIXRenderingContext context, 
     UINode           node)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.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/desktop/PageNavigationTreeRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PageNavigationTreeRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,13 +31,13 @@
  */
 public class PageNavigationTreeRenderer extends NavigationTreeRenderer
 { 
-
-
+  @Override
   protected RowKeySet getExpandedRowKeys(UIXHierarchy tree)
   {
     return ((UIXPage)tree).getDisclosedRowKeys();    
   }
 
+  @Override
   protected UIXHierarchy getTree(
     UIXRenderingContext context, 
     UINode           node)
@@ -47,6 +47,7 @@
     return component;    
   }
   
+  @Override
   protected UINode getStamp(
     UIXRenderingContext context, 
     UINode           node)
@@ -55,6 +56,7 @@
     return getNamedChild(context, pageNode, NODE_STAMP_CHILD);
   }  
   
+  @Override
   protected String getFormName(
     UIXRenderingContext context, 
     UINode           node)
@@ -62,6 +64,7 @@
     return getParentFormName(context.getParentContext());
   }
   
+  @Override
   protected boolean setInitialPath(
     UIXRenderingContext context, 
     UINode           node,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.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/desktop/PanelTabbedRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PanelTabbedRenderer.java Fri Aug 11 09:24:50 2006
@@ -36,6 +36,7 @@
  */
 public class PanelTabbedRenderer extends HtmlLafRenderer
 {
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node
@@ -44,6 +45,7 @@
     return SPAN_ELEMENT;
   }
 
+  @Override
   protected void prerender(
     UIXRenderingContext context,
     UINode           node
@@ -83,6 +85,7 @@
     }
   }
 
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -110,6 +113,7 @@
       setPartialTargets(context, partialTargets);
   }
 
+  @Override
   protected void postrender(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PollRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PollRenderer.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/desktop/PollRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PollRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,6 +31,7 @@
  */
 public class PollRenderer extends HtmlLafRenderer
 {
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -51,6 +52,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/desktop/PrintablePageLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PrintablePageLayoutRenderer.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/desktop/PrintablePageLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/PrintablePageLayoutRenderer.java Fri Aug 11 09:24:50 2006
@@ -36,6 +36,7 @@
 public class PrintablePageLayoutRenderer extends UINodeRenderer
                   implements UIConstants
 {
+  @Override
   protected UINode getRenderingUINode(
     UIXRenderingContext context,
     UINode           node

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessChoiceBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/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/desktop/ProcessChoiceBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessChoiceBarRenderer.java Fri Aug 11 09:24:50 2006
@@ -34,6 +34,7 @@
   /**
    * Writes the separator between two elements
    */
+  @Override
   protected void renderItemSpacer(
     UIXRenderingContext context
     ) throws IOException

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.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/desktop/ProcessingRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java Fri Aug 11 09:24:50 2006
@@ -41,6 +41,7 @@
 {
   /**
    */
+  @Override
   protected void renderAttributes(
     UIXRenderingContext context,
     UINode           node
@@ -54,6 +55,7 @@
    * Render a table, with the first row being the processing icon
    * and the second row being the indexed children.
    */
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node
@@ -165,6 +167,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/desktop/ProductBrandingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProductBrandingRenderer.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/desktop/ProductBrandingRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProductBrandingRenderer.java Fri Aug 11 09:24:50 2006
@@ -31,7 +31,7 @@
  */
 public class ProductBrandingRenderer extends HtmlLafRenderer
 {
-  
+  @Override
   protected void renderContent(
     UIXRenderingContext context,
     UINode           node) throws IOException
@@ -51,6 +51,7 @@
 
   }
 
+  @Override
   protected String getElementName(
     UIXRenderingContext context,
     UINode           node



Mime
View raw message