incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r429530 [1/2] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/ trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ trinidad-demo/src/main/java/org/apache/myfaces/t...
Date Tue, 08 Aug 2006 00:44:58 GMT
Author: awiner
Date: Mon Aug  7 17:44:54 2006
New Revision: 429530

URL: http://svn.apache.org/viewvc?rev=429530&view=rev
Log:
Commit Simon Lessard's patch to trinidad-api java-templates and trinidad-demo that eliminate many Java 5 warnings

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXColumnTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXComponentRefTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXFormTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXGoTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXObjectTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXOutputTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPanelTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProgressTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectManyTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOneTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOrderTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowOneTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSingleStepTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSubformTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSwitcherTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/AnimalsBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarBackingBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarOptionsBackingBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ColorBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentEditorHandler.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentTree.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CustomMessageConvertValidateBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoTreeData.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/InfiniteTree.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ListTestBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressStepsBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ReorderTest.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SelectItemTestBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TableBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeModelAdapter.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeNodeImpl.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/CompositeTest.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateField.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldTag.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ConvertSSNTag.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ValidatePasswordTag.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/ChooseIntegerBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/LaunchDialogBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/PeriodicDialogBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/AccountData.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/FolderData.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageData.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageDataModel.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessagesBackingBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/NewMessageBackingBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/PreferencesData.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/resource/EmailDemoBundle.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/DemoNavigationItem.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/MenuModelAdapter.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/resource/SkinBundle.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/AnswerValidatorTag.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/CheckboxQuestionBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/MultChoiceQuestionBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/SurveyBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/TextQuestionBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/DynamicModel.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/TableBuilder.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/tableDemos/EmployeeTableBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/CustomerBean.java
    incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/DynamicBean.java

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXColumnTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXColumnTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXColumnTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXColumnTemplate.java Mon Aug  7 17:44:54 2006
@@ -28,6 +28,7 @@
    * Does not process the facets of this column. Only this column and
    * its children are processed.
    */
+  @Override
   public void processDecodes(FacesContext context)
   {
     if (!isRendered())
@@ -44,6 +45,7 @@
    * Does not process the facets of this column. Only this column and
    * its children are processed.
    */
+  @Override
   public void processValidators(FacesContext context)
   {
     if (!isRendered())
@@ -57,6 +59,7 @@
    * Does not process the facets of this column. Only this column and
    * its children are processed.
    */
+  @Override
   public void processUpdates(FacesContext context)
   {
     if (!isRendered())

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java Mon Aug  7 17:44:54 2006
@@ -48,6 +48,7 @@
    * <code>immediate</code> flag is true,
    * <code>PhaseId.INVOKE_APPLICATION</code> otherwise.</p>
    */
+  @Override
   public void queueEvent(FacesEvent e)
   {
     if (e instanceof ActionEvent)
@@ -65,7 +66,7 @@
     super.queueEvent(e);
   }
 
-
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     // Perform special processing for ActionEvents:  tell

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXComponentRefTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXComponentRefTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXComponentRefTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXComponentRefTemplate.java Mon Aug  7 17:44:54 2006
@@ -19,6 +19,7 @@
 
 import java.util.AbstractMap;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
 
 import javax.faces.component.UIComponent;
@@ -37,6 +38,7 @@
 {
 /**/  public abstract String getVar();
 
+  @Override
   public void queueEvent(FacesEvent event)
   {
     // we want to wrap up
@@ -46,6 +48,7 @@
     super.queueEvent(event);
   }
 
+  @Override
   public void broadcast(FacesEvent event)
     throws AbortProcessingException
   {
@@ -69,7 +72,7 @@
     }
   }
 
-
+  @Override
   public void processDecodes(final FacesContext context)
   {
     Runnable runner = new Runnable()
@@ -82,6 +85,7 @@
     _processPhase(context, runner);
   }
 
+  @Override
   public void processValidators(final FacesContext context)
   {
     Runnable runner = new Runnable()
@@ -94,6 +98,7 @@
     _processPhase(context, runner);
   }
 
+  @Override
   public void processUpdates(final FacesContext context)
   {
     Runnable runner = new Runnable()
@@ -106,19 +111,20 @@
     _processPhase(context, runner);
   }
 
+  @Override
   public void encodeBegin(FacesContext context) throws IOException
   {
     _setupEL(context);
     super.encodeBegin(context);
   }
 
+  @Override
   public void encodeEnd(final FacesContext context) throws IOException
   {
     super.encodeEnd(context);
     _resetEL(context);
   }
 
-
   private void _setupEL(FacesContext context)
   {
     UIXComponentRef region = _getParent();
@@ -191,8 +197,9 @@
     return _var;
   }
 
-  private final class AttrMap extends AbstractMap
+  private final class AttrMap extends AbstractMap<Object, Object>
   {
+    @Override
     public Object get(final Object key)
     {
       FacesContext context = FacesContext.getCurrentInstance();
@@ -213,7 +220,9 @@
       return result;
     }
 
-    public Set entrySet()
+    @Override
+    @SuppressWarnings("unchecked")
+    public Set<Map.Entry<Object, Object>> entrySet()
     {
       return Collections.EMPTY_SET;
     }

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXDecorateCollectionTemplate.java Mon Aug  7 17:44:54 2006
@@ -60,6 +60,7 @@
    * @see #getCurrencyString
    * @return the local clientId
    */
+  @Override
   protected final String getLocalClientId()
   {
     String id = super.getLocalClientId();

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXEditableValueTemplate.java Mon Aug  7 17:44:54 2006
@@ -159,6 +159,7 @@
    * @exception NullPointerException if <code>event</code> is
    * <code>null</code>
    */
+  @Override
   public void broadcast(FacesEvent event)
         throws AbortProcessingException
   {
@@ -181,6 +182,7 @@
    * {@link FacesContext#renderResponse}.
    * @exception NullPointerException {@inheritDoc}
    */
+  @Override
   public void processDecodes(FacesContext context)
   {
     setValid(true);
@@ -195,6 +197,7 @@
       _executeValidate(context);
   }
 
+  @Override
   public void processUpdates(FacesContext context)
   {
     super.processUpdates(context);
@@ -212,7 +215,7 @@
     }
   }
 
-
+  @Override
   public void processValidators(FacesContext context)
   {
     super.processValidators(context);
@@ -274,6 +277,7 @@
 
   /**
    */
+  @SuppressWarnings("unchecked")
   protected void validateValue(FacesContext context, Object newValue)
   {
     if (!isValid())
@@ -292,10 +296,10 @@
     // If our value is not empty, call all validators
     else
     {
-      Iterator validators = getFacesBean().entries(VALIDATORS_KEY);
+      Iterator<Validator> validators = (Iterator<Validator>)getFacesBean().entries(VALIDATORS_KEY);
       while (validators.hasNext())
       {
-        Validator validator = (Validator) validators.next();
+        Validator validator = validators.next();
         try
         {
           validator.validate(context, this, newValue);
@@ -529,7 +533,7 @@
       return null;
     }
 
-    Class converterType = valueBinding.getType(context);
+    Class<?> converterType = valueBinding.getType(context);
     // if converterType is null, String, or Object, assume
     // no conversion is needed
     if (converterType == null ||

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXFormTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXFormTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXFormTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXFormTemplate.java Mon Aug  7 17:44:54 2006
@@ -27,7 +27,8 @@
 {
 /**/ // Abstract methods implemented by code gen
 /**/  abstract public boolean isSubmitted();
-
+  
+  @Override
   public void processDecodes(FacesContext context)
   {
     if (!isRendered())
@@ -40,12 +41,14 @@
     decodeChildren(context);
   }
 
+  @Override
   public void processValidators(FacesContext context)
   {
     if (isSubmitted())
       super.processValidators(context);
   }
 
+  @Override
   public void processUpdates(FacesContext context)
   {
     if (isSubmitted())

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXGoTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXGoTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXGoTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXGoTemplate.java Mon Aug  7 17:44:54 2006
@@ -24,6 +24,8 @@
  */
 abstract public class UIXGoTemplate extends UIXComponentBase
 {
+	
+	@Override
   void __rendererDecode(FacesContext context)
   {
     // do nothing. we have no behaviour

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXIteratorTemplate.java Mon Aug  7 17:44:54 2006
@@ -17,7 +17,6 @@
 import java.io.IOException;
 
 import java.util.AbstractMap;
-import java.util.Iterator;
 import java.util.List;
 
 import java.util.Map;
@@ -49,6 +48,7 @@
   /**
    * Override to return true.
    */
+  @Override
   public boolean getRendersChildren()
   {
     return true;
@@ -57,6 +57,7 @@
   /**
    * Repeatedly render the children as many times as needed.
    */
+  @Override
   public void encodeChildren(final FacesContext context)
     throws IOException
   {
@@ -76,6 +77,7 @@
     {
       Runner runner = new Runner()
       {
+        @Override
         protected void process(UIComponent kid) throws IOException
         {
           __encodeRecursive(context, kid);
@@ -102,11 +104,13 @@
    * <li>step - this is always one.
    * </ul>
    */
-  protected Map createVarStatusMap()
+  @Override
+  protected Map<String, Object> createVarStatusMap()
   {
-    final Map map = super.createVarStatusMap();
-    return new AbstractMap()
+    final Map<String, Object> map = super.createVarStatusMap();
+    return new AbstractMap<String, Object>()
     {
+      @Override
       public Object get(Object key)
       {
         // some of these keys are from <c:forEach>, ie:
@@ -132,13 +136,15 @@
         return map.get(key);
       }
     
-      public Set entrySet()
+      @Override
+      public Set<Map.Entry<String, Object>> entrySet()
       {
         return map.entrySet();
       }
     };
   }
 
+  @Override
   protected CollectionModel createCollectionModel(
     CollectionModel current,
     Object value)
@@ -153,12 +159,14 @@
     return model;
   }
 
+  @Override
   protected void processFacetsAndChildren(
     final FacesContext context,
     final PhaseId phaseId)
   {
     Runner runner = new Runner()
     {
+      @Override
       protected void process(UIComponent kid)
       {
         processComponent(context, kid, phaseId);
@@ -171,7 +179,7 @@
   {
     public final void run()
     {
-      List stamps = getStamps();
+      List<UIComponent> stamps = getStamps();
       int oldIndex = getRowIndex();
       int first = getFirst();
       int rows = getRows();
@@ -185,10 +193,9 @@
           setRowIndex(i);
           if (isRowAvailable())
           {
-            Iterator kids = stamps.iterator();
-            while(kids.hasNext())
+            for(UIComponent stamp : stamps)
             {
-              process((UIComponent) kids.next());
+              process(stamp);
             }
           }
           else
@@ -209,6 +216,7 @@
     protected abstract void process(UIComponent comp) throws Exception;
   }
 
+  @Override
   void __encodeBegin(FacesContext context) throws IOException
   {
     _fixupFirst();

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationLevelTemplate.java Mon Aug  7 17:44:54 2006
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.trinidad.component;
 
-import java.util.List;
-
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 
@@ -32,7 +30,7 @@
 /**/ // Abstract methods implemented by code gen
 /**/  abstract public int getLevel();
 
-
+	@Override
   protected void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationPathTemplate.java Mon Aug  7 17:44:54 2006
@@ -31,6 +31,8 @@
  */
 abstract public class UIXNavigationPathTemplate extends UIXNavigationHierarchy
 {
+	
+  @Override
   protected void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)
@@ -41,7 +43,9 @@
     
     if (focusPath != null )
     {
-      List paths = new ArrayList(getAllAncestorContainerRowKeys(focusPath));
+      List<Object> paths = 
+        new ArrayList<Object>(getAllAncestorContainerRowKeys(focusPath));
+      
       paths.add(focusPath);
       int focusPathSize = paths.size();
       UIComponent nodeStamp = getFacet("nodeStamp");

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXNavigationTreeTemplate.java Mon Aug  7 17:44:54 2006
@@ -45,6 +45,7 @@
   /**
    * Sets the phaseID of UI events depending on the "immediate" property.
    */
+  @Override
   public void queueEvent(FacesEvent event)
   {
     TableUtils.__handleQueueEvent(this, event);
@@ -56,6 +57,7 @@
    * @param event
    * @throws javax.faces.event.AbortProcessingException
    */
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   { 
     HierarchyUtils.__handleBroadcast(this, 
@@ -65,9 +67,9 @@
     super.broadcast(event);
   }
  
- 
-    
- public CollectionModel createCollectionModel(CollectionModel current, Object value)
+  @Override
+  @SuppressWarnings("unchecked")
+  public CollectionModel createCollectionModel(CollectionModel current, Object value)
   {
     TreeModel model = (TreeModel)super.createCollectionModel(current, value);    
     RowKeySet treeState = getDisclosedRowKeys();
@@ -75,10 +77,9 @@
     return model;
   }
 
-
-
-
- protected void processFacetsAndChildren(
+  @Override
+  @SuppressWarnings("unchecked")
+  protected void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)
   {
@@ -94,12 +95,14 @@
     setRowKey(oldPath);
   } 
   
- void __encodeBegin(FacesContext context) throws IOException
+  @Override
+  void __encodeBegin(FacesContext context) throws IOException
   {
     HierarchyUtils.__handleEncodeBegin(this, getDisclosedRowKeys());
     super.__encodeBegin(context);
   }
 
+  @Override
   void __init()
   {
     super.__init();

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXObjectTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXObjectTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXObjectTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXObjectTemplate.java Mon Aug  7 17:44:54 2006
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 package org.apache.myfaces.trinidad.component;
-import javax.faces.context.FacesContext;
 
 
 /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXOutputTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXOutputTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXOutputTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXOutputTemplate.java Mon Aug  7 17:44:54 2006
@@ -24,6 +24,8 @@
  */
 abstract public class UIXOutputTemplate extends UIXValue
 {
+	
+  @Override
   void __rendererDecode(FacesContext context)
   {
     // do nothing. we have no behaviour

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPageTemplate.java Mon Aug  7 17:44:54 2006
@@ -40,13 +40,15 @@
  */
 abstract public class UIXPageTemplate extends UIXMenuHierarchy
 {
+	
 /**/  public abstract RowKeySet getDisclosedRowKeys();
 /**/  public abstract void setDisclosedRowKeys(RowKeySet state);
 /**/  public abstract MethodBinding getRowDisclosureListener();
 
- /**
+  /**
    * Sets the phaseID of UI events depending on the "immediate" property.
    */
+  @Override
   public void queueEvent(FacesEvent event)
   {
     TableUtils.__handleQueueEvent(this, event);
@@ -58,6 +60,7 @@
    * @param event
    * @throws javax.faces.event.AbortProcessingException
    */
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   { 
     HierarchyUtils.__handleBroadcast(this, 
@@ -67,7 +70,7 @@
     super.broadcast(event);
   }
  
-   
+  @Override
  public CollectionModel createCollectionModel(CollectionModel current, Object value)
   {
     TreeModel model = (TreeModel)super.createCollectionModel(current, value);    
@@ -76,6 +79,7 @@
     return model;
   }
  
+  @Override
   protected void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)
@@ -108,13 +112,14 @@
         
   }
 
-
+  @Override
   void __encodeBegin(FacesContext context) throws IOException
   {
     HierarchyUtils.__handleEncodeBegin(this, getDisclosedRowKeys());
     super.__encodeBegin(context);
   }
   
+  @Override
   void __init()
   {
     super.__init();

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPanelTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPanelTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPanelTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPanelTemplate.java Mon Aug  7 17:44:54 2006
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 package org.apache.myfaces.trinidad.component;
-import javax.faces.context.FacesContext;
 
 
 /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXPollTemplate.java Mon Aug  7 17:44:54 2006
@@ -29,12 +29,14 @@
  */
 abstract public class UIXPollTemplate extends UIXComponentBase
 {
+	
 /**/ // Abstract methods implemented by code gen
 /**/  abstract public boolean isImmediate();
 /**/  abstract public MethodBinding getPollListener();
 
   //
   // Abstract methods implemented by subclass.
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     // Perform standard superclass processing
@@ -47,6 +49,7 @@
     }
   }
 
+  @Override
   public void queueEvent(FacesEvent e)
   {
     if ((e instanceof PollEvent) && (e.getSource() == this))

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProcessTemplate.java Mon Aug  7 17:44:54 2006
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.trinidad.component;
 
-import java.util.List;
-
 import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseId;
 
@@ -30,7 +28,7 @@
 abstract public class UIXProcessTemplate extends UIXMenuHierarchy
 {
   
-
+  @Override
   protected void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProgressTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProgressTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProgressTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXProgressTemplate.java Mon Aug  7 17:44:54 2006
@@ -34,6 +34,8 @@
                 extends UIXComponentBase
                 implements ActionSource
 {
+	
+  @Override
   public void queueEvent(FacesEvent e)
   {
     if (e.getSource() == this && e instanceof ActionEvent)
@@ -47,6 +49,7 @@
     super.queueEvent(e);
   }
 
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     super.broadcast(event);

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java Mon Aug  7 17:44:54 2006
@@ -38,6 +38,7 @@
 abstract public class UIXSelectInputTemplate extends UIXEditableValue
                                       implements ActionSource
 {
+	
 /**/ // Abstract methods implemented by code gen
 /**/  abstract public MethodBinding getActionListener();
 /**/  abstract public MethodBinding getReturnListener();
@@ -46,6 +47,7 @@
    * <p>Intercept <code>queueEvent</code> and mark the phaseId for any
    * ActionEvents to be <code>PhaseId.APPLY_REQUEST_VALUES</code>.
    */
+  @Override
   public void queueEvent(FacesEvent e)
   {
     if (e instanceof ActionEvent)
@@ -69,6 +71,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     if (event instanceof ActionEvent)

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectManyTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectManyTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectManyTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectManyTemplate.java Mon Aug  7 17:44:54 2006
@@ -40,11 +40,13 @@
    * @todo walk through UIXSelectItem values to determine that new
    *       values are permitted
    */
+  @Override
   protected void validateValue(FacesContext context, Object newValue)
   {
     super.validateValue(context, newValue);
   }
 
+  @Override
   protected boolean isEmpty(Object value)
   {
     if (value == null)
@@ -59,7 +61,7 @@
     return false;
   }
 
-
+  @Override
   protected String getRequiredMessageKey()
   {
     return REQUIRED_MESSAGE_ID;
@@ -70,6 +72,7 @@
    * @todo improve efficiency
    * @return true if the values are different
    */
+  @Override
   protected boolean compareValues(Object previous, Object value)
   {
     int prevSize = __getSize(previous);
@@ -83,8 +86,8 @@
     if (prevSize == 0)
       return false;
 
-    List prevList = __toList(previous);
-    List newList = __toList(value);
+    List<Object> prevList = __toList(previous);
+    List<Object> newList = __toList(value);
     return _destructiveCompareOutOfOrderLists(prevList, newList);
   }
 
@@ -113,8 +116,8 @@
   // mutating one or the other list.
   //
   static private boolean _destructiveCompareOutOfOrderLists(
-    List one,
-    List two)
+    List<Object> one,
+    List<Object> two)
   {
     int size = one.size();
 
@@ -139,15 +142,16 @@
   // Convert an Object to a mutable, copied List;  copied
   // because our compare routine is destructive.
   //
-  static List __toList(Object o)
+  @SuppressWarnings("unchecked")
+  static List<Object> __toList(Object o)
   {
     if (o == null)
       return null;
 
-    ArrayList listCopy = new ArrayList();
+    ArrayList<Object> listCopy = new ArrayList<Object>();
     if (o instanceof Collection)
     {
-      listCopy.addAll((Collection) o);
+      listCopy.addAll((Collection<Object>) o);
     }
     // Use java.lang.reflect.Array, etc. to support primitive Object arrays
     else if (o.getClass().isArray())

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOneTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOneTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOneTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOneTemplate.java Mon Aug  7 17:44:54 2006
@@ -27,12 +27,13 @@
    * @todo walk through UIXSelectItem values to determine that the new
    *       value is permitted
    */
+  @Override
   public void validateValue(FacesContext context, Object newValue)
   {
     super.validateValue(context, newValue);
   }
   
-
+  @Override
   protected String getRequiredMessageKey()
   {
     return REQUIRED_MESSAGE_ID;

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOrderTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOrderTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOrderTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectOrderTemplate.java Mon Aug  7 17:44:54 2006
@@ -19,11 +19,14 @@
 
 abstract public class UIXSelectOrderTemplate extends UIXSelectMany
 {
+	
   /**
    * Compares two values, paying attention to the order of the elements.
    * @todo improve efficiency
    * @return true if the values are different
    */
+  @Override
+  @SuppressWarnings("unchecked")
   protected boolean compareValues(Object previous, Object value)
   {
     int prevSize = __getSize(previous);
@@ -37,10 +40,10 @@
     if (prevSize == 0)
       return false;
 
-    List prevList = (previous instanceof List)
-                      ? (List) previous : __toList(previous);
-    List newList = (value instanceof List)
-                      ? (List) value : __toList(value);
+    List<Object> prevList = (previous instanceof List)
+                      ? (List<Object>) previous : __toList(previous);
+    List<Object> newList = (value instanceof List)
+                      ? (List<Object>) value : __toList(value);
 
     // Since List has explicit rules about how equals() works, we
     // can just use that method.

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectRangeTemplate.java Mon Aug  7 17:44:54 2006
@@ -41,13 +41,14 @@
 /**/  abstract public boolean isImmediate();
 /**/  abstract public Object getValue();
 
-
+  @Override
   public void encodeBegin(FacesContext context) throws IOException
   {
     _flushCachedDataModel();
     super.encodeBegin(context);
   }
 
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     // Notify the specified RangeChanged listener method (if any)
@@ -63,11 +64,13 @@
     // Perform standard superclass processing
     super.broadcast(event);
   }
+  
   /**
    * * We don't want to update model if we have validation errors
    * on the page, so if not immediate, queue the event in
    * INVOKE_APPLICATION phase.
    */
+  @Override
   public void queueEvent(FacesEvent e)
   {
     if ((e instanceof RangeChangeEvent) && (e.getSource() == this))

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowDetailTemplate.java Mon Aug  7 17:44:54 2006
@@ -36,6 +36,7 @@
 /**/  abstract public boolean isImmediate();
 /**/  abstract public MethodBinding getDisclosureListener();
 
+  @Override
   public void processDecodes(FacesContext context)
   {
     // If we're not disclosed, only process ourselves
@@ -48,18 +49,21 @@
       super.processDecodes(context);
   }
 
+  @Override
   public void processValidators(FacesContext context)
   {
     if (isDisclosed())
       super.processValidators(context);
   }
 
+  @Override
   public void processUpdates(FacesContext context)
   {
     if (isDisclosed())
       super.processUpdates(context);
   }
 
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     // Perform standard superclass processing
@@ -86,6 +90,7 @@
    * or INVOKE_APPLICATION?  Or should we only support non-immediate
    * ShowDetails?
    */
+  @Override
   public void queueEvent(FacesEvent e)
   {
     if ((e instanceof DisclosureEvent) && (e.getSource() == this))

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowOneTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowOneTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowOneTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXShowOneTemplate.java Mon Aug  7 17:44:54 2006
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import javax.faces.component.UIComponent;
 import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
 
@@ -30,6 +31,9 @@
  */
 abstract public class UIXShowOneTemplate extends UIXComponentBase
 {
+	
+  @Override
+  @SuppressWarnings("unchecked")
   public void queueEvent(FacesEvent e)
   {
     //  Care only if it is a DisclosureEvent, and only if its source is one of
@@ -42,15 +46,18 @@
       //  showDetailItem
       if (((DisclosureEvent) e).isExpanded())
       {
-        List children = getChildren();
-        int childCount = children.size();
         UIXShowDetail toBeUnDisclosedChild = null;
-        for (int i=0; i<childCount; i++)
+        List<UIComponent> children = getChildren();
+        for(UIComponent child : children)
         {
-          toBeUnDisclosedChild =  (UIXShowDetail) children.get(i);
-          if (toBeUnDisclosedChild.isDisclosed())
-            break;
+          if (child instanceof UIXShowDetail)
+          {
+            toBeUnDisclosedChild =  (UIXShowDetail) child;
+            if (toBeUnDisclosedChild.isDisclosed())
+              break;
+          }
         }
+        
         //  Override the phaseId that would be already set on this event
         //  (coming off of the to-be-disclosed showDetailItem), because the
         //  phase-id should actually be determined by the 'immediate' attribute

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSingleStepTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSingleStepTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSingleStepTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSingleStepTemplate.java Mon Aug  7 17:44:54 2006
@@ -46,7 +46,7 @@
 /**/  abstract public void setPreviousAction(MethodBinding action);
 /**/  abstract public void setNextAction(MethodBinding action);
 
-
+  @Override
   public void queueEvent(FacesEvent e)
   {
     if (e.getSource() == this)
@@ -79,11 +79,13 @@
     * remove (then restore) default Listeners before saving state -
     * this note copied from form.submitButtonBase.saveState....
    */
+  @Override
   public Object saveState(FacesContext context)
   {
     return super.saveState(context);
   }
 
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     // Perform standard superclass processing

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSubformTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSubformTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSubformTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSubformTemplate.java Mon Aug  7 17:44:54 2006
@@ -35,6 +35,7 @@
 /**/  abstract public void setSubmitted(boolean submitted);
 /**/  abstract public boolean isDefault();
 
+  @Override
   public void queueEvent(FacesEvent event)
   {
     // If the event is being queued for anything *after* APPLY_REQUEST_VALUES,
@@ -48,12 +49,14 @@
     super.queueEvent(event);
   }
 
+  @Override
   public void processDecodes(FacesContext context)
   {
     setSubmitted(false);
     super.processDecodes(context);
   }
 
+  @Override
   public void processValidators(FacesContext context)
   {
     if (!isSubmitted() && isDefault() && !_isSomethingSubmitted(context))
@@ -63,12 +66,14 @@
       super.processValidators(context);
   }
 
+  @Override
   public void processUpdates(FacesContext context)
   {
     if (isSubmitted())
       super.processUpdates(context);
   }
 
+  @SuppressWarnings("unchecked")
   static private void _storeSomethingSubmitted(FacesContext context)
   {
     context.getExternalContext().getRequestMap().put(_SOMETHING_SUBMITTED,

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSwitcherTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSwitcherTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSwitcherTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSwitcherTemplate.java Mon Aug  7 17:44:54 2006
@@ -36,6 +36,7 @@
   /**
    * Only decode the currently active facet.
    */
+  @Override
   public void processDecodes(FacesContext context)
   {
     UIComponent facet = _getFacet();
@@ -46,6 +47,7 @@
   /**
    * Only process validations on the currently active facet.
    */
+  @Override
   public void processValidators(FacesContext context)
   {
     UIComponent facet = _getFacet();
@@ -57,6 +59,7 @@
   /**
    * Only process updates on the currently active facet.
    */
+  @Override
   public void processUpdates(FacesContext context)
   {
     UIComponent facet = _getFacet();
@@ -68,6 +71,7 @@
   /**
    * Only render the currently active facet.
    */
+  @Override
   public void encodeChildren(FacesContext context)
     throws IOException
   {
@@ -80,6 +84,7 @@
   /**
    * Override to return true.
    */
+  @Override
   public boolean getRendersChildren()
   {
     return true;

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java Mon Aug  7 17:44:54 2006
@@ -33,6 +33,7 @@
 import org.apache.myfaces.trinidad.model.CollectionModel;
 import org.apache.myfaces.trinidad.model.RowKeySet;
 import org.apache.myfaces.trinidad.model.RowKeySetImpl;
+import org.apache.myfaces.trinidad.model.SortCriterion;
 
 /**
  * Base class for the Table component. The behaviour supported by this base class
@@ -45,7 +46,8 @@
   implements CollectionComponent
 {
 
-  public void setSortCriteria(List criteria)
+  @Override
+  public void setSortCriteria(List<SortCriterion> criteria)
   {
     _sortCriteria = criteria;
     super.setSortCriteria(criteria);
@@ -54,6 +56,7 @@
   /**
    * Sets the phaseID of UI events depending on the "immediate" property.
    */
+	@Override
   public void queueEvent(FacesEvent event)
   {
     TableUtils.__handleQueueEvent(this, event);
@@ -65,6 +68,7 @@
    * @param event
    * @throws javax.faces.event.AbortProcessingException
    */
+	@Override
   public void broadcast(FacesEvent event)
     throws AbortProcessingException
   {
@@ -137,6 +141,8 @@
 /**/  public abstract MethodBinding getSelectionListener();
 /**/  public abstract boolean isImmediate();
 
+	@Override
+	@SuppressWarnings("unchecked")
   public Object saveState(FacesContext context)
   {
     Object o = super.saveState(context);
@@ -147,6 +153,7 @@
     return new Object[]{o, _sortCriteria};
   }
 
+	@Override
   public void restoreState(FacesContext context, Object state)
   {
     Object[] array = (Object[]) state;
@@ -158,7 +165,7 @@
     // and that may invoke client code that isn't quite in a state
     // to be invoked, in part because component "binding"s have not been
     // evaluated yet.
-    List criteria = (List) array[1];
+    List<SortCriterion> criteria = (List<SortCriterion>) array[1];
     _sortCriteria = criteria;
   }
 
@@ -191,6 +198,7 @@
     return null;
   }
 
+  @Override
   protected final void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)
@@ -213,13 +221,14 @@
    * the detail stamp (if any).
    * @todo cache the result.
    */
-  protected final List getStamps()
+  @Override
+  protected final List<UIComponent> getStamps()
   {
-    List children = super.getStamps();
+    List<UIComponent> children = super.getStamps();
     UIComponent detail = getDetailStamp();
     if (detail != null)
     {
-      List stamps = new ArrayList(children.size() + 1);
+      List<UIComponent> stamps = new ArrayList<UIComponent>(children.size() + 1);
       stamps.addAll(children);
       stamps.add(detail);
       return stamps;
@@ -231,6 +240,7 @@
    * Saves the state for the given stamp.
    * This method avoids changing the state of facets on columns.
    */
+  @Override
   protected final Object saveStampState(FacesContext context, UIComponent stamp)
   {
     if (stamp instanceof UIXColumn)
@@ -247,6 +257,7 @@
    * Restores the state for the given stamp.
    * This method avoids changing the state of facets on columns.
    */
+  @Override
   protected final void restoreStampState(FacesContext context, UIComponent stamp,
                                          Object stampState)
   {
@@ -260,6 +271,7 @@
       super.restoreStampState(context, stamp, stampState);
   }
 
+  @Override
   protected final CollectionModel createCollectionModel(
     CollectionModel current,
     Object value)
@@ -281,6 +293,7 @@
   /**
    * Gets the internal state of this component.
    */
+  @Override
   Object __getMyStampState()
   {
     Object[] state = new Object[6];
@@ -297,6 +310,7 @@
    * Sets the internal state of this component.
    * @param stampState the internal state is obtained from this object.
    */
+  @Override
   void __setMyStampState(Object stampState)
   {
     Object[] state = (Object[]) stampState;
@@ -339,7 +353,7 @@
     }
   }
 
-
+  @Override
   void __init()
   {
     super.__init();
@@ -353,5 +367,5 @@
     setFirst(getFirst());
   }
 
-  transient private List _sortCriteria = null;
+  transient private List<SortCriterion> _sortCriteria = null;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTableTemplate.java Mon Aug  7 17:44:54 2006
@@ -31,7 +31,6 @@
 import org.apache.myfaces.trinidad.event.FocusEvent;
 import org.apache.myfaces.trinidad.event.RangeChangeEvent;
 import org.apache.myfaces.trinidad.event.RangeChangeListener;
-import org.apache.myfaces.trinidad.event.SelectionEvent;
 import org.apache.myfaces.trinidad.model.RowKeySet;
 import org.apache.myfaces.trinidad.model.TreeModel;
 
@@ -55,6 +54,7 @@
    * {@link #getRowsByDepth}.
    * @return 0 if all rows must be shown at this level.
    */
+  @Override
   public final int getRows()
   {
     int depth = getTreeModel().getDepth();
@@ -83,13 +83,14 @@
    * @return zero based index of the row that must be displayed first.
    * @see #getRowData()
    */
+  @Override
   public final int getFirst()
   {
     // "first" does not change per path. It changes per parent path.
     // this is because "first", "rows" and "rowCount" applies to the container
     // element and not the current element:
     Object container = _getContainerPath();
-    Integer first = (Integer) _firstMap.get(container);
+    Integer first = _firstMap.get(container);
     return (first != null) ? first.intValue() : 0;
   }
 
@@ -108,7 +109,7 @@
     // element and not the current element:
     Object container = _getContainerPath();
     if (_firstMap == Collections.EMPTY_MAP)
-      _firstMap = new HashMap(3);
+      _firstMap = new HashMap<Object, Integer>(3);
 
     if (index <= 0)
       _firstMap.remove(container);
@@ -141,6 +142,7 @@
     return (RangeChangeListener[]) getFacesListeners(RangeChangeListener.class);
   }
 
+  @Override
   public Object saveState(FacesContext context)
   {
     Object[] array = new Object[2];
@@ -153,15 +155,18 @@
     return array;
   }
 
+  @Override
+  @SuppressWarnings("unchecked")
   public void restoreState(FacesContext context, Object state)
   {
     Object[] array = (Object[]) state;
     super.restoreState(context, array[0]);
-    _firstMap = (Map) array[1];
+    _firstMap = (Map<Object, Integer>) array[1];
     if (_firstMap == null)
       _firstMap = Collections.EMPTY_MAP;
   }
 
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   {
     // Notify the specified disclosure listener method (if any)
@@ -197,13 +202,15 @@
    * the nodeStamp stamp (if any).
    * @todo cache the result.
    */
+  @SuppressWarnings("unchecked")
+  @Override
   protected final List getStamps()
   {
-    List children = getChildren();
+    List<UIComponent> children = getChildren();
     UIComponent nodeStamp = getNodeStamp();
     if (nodeStamp != null)
     {
-      List stamps = new ArrayList(children.size() + 1);
+      List<UIComponent> stamps = new ArrayList<UIComponent>(children.size() + 1);
       stamps.addAll(children);
       stamps.add(nodeStamp);
       return stamps;
@@ -215,6 +222,7 @@
    * Restores the state for the given stamp.
    * This method avoids changing the state of facets on columns.
    */
+  @Override
   protected final void restoreStampState(FacesContext context, UIComponent stamp,
                                          Object stampState)
   {
@@ -232,6 +240,7 @@
    * Saves the state for the given stamp.
    * This method avoids changing the state of facets on columns.
    */
+  @Override
   protected final Object saveStampState(FacesContext context, UIComponent stamp)
   {
     if (stamp instanceof UIXColumn)
@@ -244,6 +253,8 @@
       return super.saveStampState(context, stamp);
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   protected final void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)
@@ -294,6 +305,7 @@
     }
   }
 
+  @Override
   void __init()
   {
     super.__init();
@@ -321,5 +333,5 @@
     return parentKey;
   }
 
-  private Map _firstMap = Collections.EMPTY_MAP;
+  private Map<Object, Integer> _firstMap = Collections.EMPTY_MAP;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java Mon Aug  7 17:44:54 2006
@@ -45,6 +45,7 @@
   /**
    * Sets the phaseID of UI events depending on the "immediate" property.
    */
+  @Override
   public void queueEvent(FacesEvent event)
   {
     TableUtils.__handleQueueEvent(this, event);
@@ -56,6 +57,7 @@
    * @param event
    * @throws javax.faces.event.AbortProcessingException
    */
+  @Override
   public void broadcast(FacesEvent event) throws AbortProcessingException
   { 
     if (event instanceof SelectionEvent)
@@ -74,7 +76,7 @@
     super.broadcast(event);
   }
  
-
+  @Override
   public CollectionModel createCollectionModel(CollectionModel current, Object value)
   {
     
@@ -85,8 +87,7 @@
     return model;
   }
 
- 
-  
+  @Override
   protected void processFacetsAndChildren(
     FacesContext context,
     PhaseId phaseId)
@@ -96,20 +97,21 @@
     Object oldPath = getRowKey();
     setRowKey(null);
     HierarchyUtils.__iterateOverTree(context, 
-                                      phaseId, 
-                                      this, 
-				      getDisclosedRowKeys(),
-                                      true);
+                                     phaseId, 
+                                     this, 
+                                     getDisclosedRowKeys(),
+                                     true);
     setRowKey(oldPath);
   }
 
- 
+  @Override
   void __encodeBegin(FacesContext context) throws IOException
   {
     HierarchyUtils.__handleEncodeBegin(this, getDisclosedRowKeys());
     super.__encodeBegin(context);
   }
 
+  @Override
   void __init()
   {
     super.__init();

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/AnimalsBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/AnimalsBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/AnimalsBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/AnimalsBean.java Mon Aug  7 17:44:54 2006
@@ -25,7 +25,7 @@
 {
   public AnimalsBean()
   {
-    _names = new ArrayList();
+    _names = new ArrayList<String>();
     _names.add("Aardvark");
     _names.add("Albatross ");
     _names.add("Alligator");
@@ -118,12 +118,12 @@
     _namesInRange = _names.subList(_start, _end);
   }
 
-  public List getNames()
+  public List<String> getNames()
   {
     return _names;
   }
   
-  public List getNamesInRange()
+  public List<String> getNamesInRange()
   {
 
     return _namesInRange;
@@ -175,7 +175,7 @@
     _end = end;   
   } 
   
-  private void _setNamesInRange(List namesInRange)
+  private void _setNamesInRange(List<String> namesInRange)
   {
     _namesInRange = namesInRange;
 
@@ -185,9 +185,9 @@
   private int _start = 0;  
   private int _end;
   
-  private List _names;
+  private List<String> _names;
   
-  private List _namesInRange;
+  private List<String> _namesInRange;
   
   private static final int _BLOCK_SIZE = 5;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarBackingBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarBackingBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarBackingBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarBackingBean.java Mon Aug  7 17:44:54 2006
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +32,7 @@
 
 public class CarBackingBean
 {
-  public List getMakes()
+  public List<SelectItem> getMakes()
   {
     return _MAKE_ITEMS;
   }
@@ -85,6 +84,7 @@
     return _PRICES.get(model);
   }
 
+  @SuppressWarnings("unchecked")
   public void returnOptions(ReturnEvent event)
   {
     Object value = event.getReturnValue();
@@ -92,10 +92,8 @@
     int addedPrice = 0;
     if (value instanceof List)
     {
-      Iterator options = ((List) value).iterator();
-      while (options.hasNext())
+      for(CarOption option : (List<CarOption>) value)
       {
-        CarOption option = (CarOption) options.next();
         addedPrice = addedPrice + option.getPrice();
         if (buffer.length() != 0)
           buffer.append(", ");
@@ -114,12 +112,12 @@
   private CoreCommandLink _launchOptions;
   private UISelectItems  _modelItems;
 
-  static private final List _MAKE_ITEMS = new ArrayList();
-  static private final List _CORDERA_MODELS = new ArrayList();
-  static private final List _AUTUMNO_MODELS = new ArrayList();
-  static private final List _GRABOWSKI_MODELS = new ArrayList();
+  static private final List<SelectItem> _MAKE_ITEMS       = new ArrayList<SelectItem>();
+  static private final List<SelectItem> _CORDERA_MODELS   = new ArrayList<SelectItem>();
+  static private final List<SelectItem> _AUTUMNO_MODELS   = new ArrayList<SelectItem>();
+  static private final List<SelectItem> _GRABOWSKI_MODELS = new ArrayList<SelectItem>();
 
-  static private final Map _PRICES = new HashMap();
+  static private final Map<String, Integer> _PRICES = new HashMap<String, Integer>();
 
   static private final SelectItem _NULL_SELECT_ITEM = new SelectItem("");
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarOptionsBackingBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarOptionsBackingBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarOptionsBackingBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CarOptionsBackingBean.java Mon Aug  7 17:44:54 2006
@@ -25,13 +25,13 @@
 
 public class CarOptionsBackingBean
 {
-  public List getOptions() { return _options; }
-  public void setOptions(List options) { _options = options; }
+  public List<String> getOptions() { return _options; }
+  public void setOptions(List<String> options) { _options = options; }
 
   public String pickOptions()
   {
-    List options = getOptions();
-    List realOptionObjects = new ArrayList();
+    List<String> options = getOptions();
+    List<CarOption> realOptionObjects = new ArrayList<CarOption>();
     for (int i = 0; i < _AVAILABLE_OPTIONS.length; i++)
     {
       if (options.contains("" + i))
@@ -43,14 +43,14 @@
     return null;
   }
 
-  public List getOptionsItems()
+  public List<SelectItem> getOptionsItems()
   {
     return _OPTIONS_ITEMS;
   }
 
-  private List _options;
+  private List<String> _options;
 
-  static private final List _OPTIONS_ITEMS = new ArrayList();
+  static private final List<SelectItem> _OPTIONS_ITEMS = new ArrayList<SelectItem>();
 
   static private final CarOption[] _AVAILABLE_OPTIONS =
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ColorBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ColorBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ColorBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ColorBean.java Mon Aug  7 17:44:54 2006
@@ -76,9 +76,9 @@
     return colorArray;
   }
 
-  public List getColorList()
+  public List<Color> getColorList()
   {
-    List colorList = new ArrayList();
+    List<Color> colorList = new ArrayList<Color>();
     colorList.add(_colorValue3);
     colorList.add(_colorValue1);
     colorList.add(_colorValue4);

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentEditorHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentEditorHandler.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentEditorHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentEditorHandler.java Mon Aug  7 17:44:54 2006
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.faces.component.UIComponent;
@@ -33,13 +32,12 @@
 {
   public String update()
   {
-    List list = _list;
+    List<PropertyOfComponent> list = _list;
     if (list != null)
     {
-      Iterator iter = list.iterator();
-      while (iter.hasNext())
+      for(PropertyOfComponent prop : list)
       {
-        ((PropertyOfComponent) (iter.next())).flushToComponent();
+        prop.flushToComponent();
       }
     }
 
@@ -66,7 +64,7 @@
     _javascriptShown = javascriptShown;
   }
 
-  public List getAttributes()
+  public List<PropertyOfComponent> getAttributes()
   {
     if (_list != null)
       return _list;
@@ -75,7 +73,7 @@
     if (comp == null)
       return null;
 
-    List list = new ArrayList();
+    List<PropertyOfComponent> list = new ArrayList<PropertyOfComponent>();
     try
     {
       BeanInfo beanInfo = Introspector.getBeanInfo(comp.getClass());
@@ -99,7 +97,7 @@
           continue;
                         
 
-        Class type = descriptor.getPropertyType();
+        Class<?> type = descriptor.getPropertyType();
         if ((type == String.class) ||
             (type == Object.class))
         {
@@ -143,7 +141,7 @@
     return null;
   }
 
-  static public class PropertyOfComponent implements Comparable
+  static public class PropertyOfComponent implements Comparable<PropertyOfComponent>
   {
     public PropertyOfComponent(UIComponent component,
                                PropertyDescriptor descriptor)
@@ -153,9 +151,8 @@
     }
 
     // Sort by the name of the property
-    public int compareTo(Object o)
+    public int compareTo(PropertyOfComponent poc)
     {
-      PropertyOfComponent poc = (PropertyOfComponent) o;
       return getName().compareTo(poc.getName());
     }
 
@@ -169,6 +166,7 @@
       return null;
     }
 
+    @SuppressWarnings("unchecked")
     public void flushToComponent()
     {
       if (_valueSet)
@@ -180,7 +178,7 @@
       Method method = _descriptor.getReadMethod();
       try
       {
-        return method.invoke(_component, null);
+        return method.invoke(_component, (Object[])null);
       }
       catch (Exception e)
       {
@@ -228,6 +226,7 @@
       setProperty(i);
     }
 
+    @Override
     public String getType()
     {
       return "integer";
@@ -252,6 +251,7 @@
       setProperty(i);
     }
 
+    @Override
     public String getType()
     {
       return "date";
@@ -279,6 +279,7 @@
       setProperty(s);
     }
 
+    @Override
     public String getType()
     {
       return "string";
@@ -304,6 +305,7 @@
       setProperty(b);
     }
 
+    @Override
     public String getType()
     {
       return "boolean";
@@ -311,7 +313,7 @@
   }
 
 
-  private UIComponent _editedComponent;
-  private boolean     _javascriptShown = true;
-  private List        _list;
+  private UIComponent               _editedComponent;
+  private boolean                   _javascriptShown = true;
+  private List<PropertyOfComponent> _list;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentTree.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentTree.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentTree.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ComponentTree.java Mon Aug  7 17:44:54 2006
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,15 +41,15 @@
   {
   }
   
-  public List getComponents()
+  public List<Bean> getComponents()
   {
     if (_components == null)
     {
       Node root = new Node();
-      List files = getFileList();
+      List<String> files = getFileList();
       for(int i=0; i<files.size(); i++)
       {
-        String file = (String) files.get(i);
+        String file = files.get(i);
         try
         {
           _processFile(root, file);
@@ -66,12 +65,12 @@
     return _components;
   }
   
-  public List getFileList()
+  public List<String> getFileList()
   {
     return _fileList;
   }
 
-  public void setFileList(List files)
+  public void setFileList(List<String> files)
   {
     _fileList = files;
   }
@@ -83,19 +82,20 @@
     return null;
   }
   
+  @SuppressWarnings("unchecked")
   public void setTree(UIComponent treeComp)
   {
     // this bean's lifecycle is application. this method is called
     // per user, so don't change any state on this bean.
     UIXTree tree = (UIXTree) treeComp;
-    Map attrs = tree.getAttributes();
+    Map<String, Object> attrs = tree.getAttributes();
     final String _key = "org.apache.myfaces.trinidaddemo.vuew.faces.ComponentTree";
     // has this tree been initialized?
     if (attrs.get(_key) == null)
     {
       // tree has not been initialized.
       attrs.put(_key, Boolean.TRUE); // mark as initialized
-      RowKeySetTreeImpl state = new RowKeySetTreeImpl(true);
+      RowKeySetTreeImpl<Object> state = new RowKeySetTreeImpl<Object>(true);
       tree.setDisclosedRowKeys(state);
     }
   }
@@ -138,14 +138,14 @@
   // under.
   private static Node _procureChildNode(Node parent, String token)
   {
-    Map parentMap = parent.kids;
+    Map<String, Node> parentMap = parent.kids;
     if (parentMap == null)
     {
-      parentMap = new HashMap(3);
+      parentMap = new HashMap<String, Node>(3);
       parent.kids = parentMap;
     }
   
-    Node childNode = (Node) parentMap.get(token);
+    Node childNode = parentMap.get(token);
     if (childNode == null)
     {
       childNode = new Node();
@@ -161,25 +161,21 @@
     return tokens;
   }
   
-  private static List _createChildList(Node root, String label)
+  private static List<Bean> _createChildList(Node root, String label)
   {
-    Map kids = root.kids;
+    Map<String, Node> kids = root.kids;
     if (kids == null)
     {
       return null;
     }
     else
     {
-      List kidList = new ArrayList(kids.size());
-      Iterator entries = kids.entrySet().iterator();
-      while(entries.hasNext())
+      List<Bean> kidList = new ArrayList<Bean>(kids.size());
+      for(Entry<String, Node> entry : kids.entrySet())
       {
-        
-        Entry e = (Entry) entries.next();
-        String token = (String) e.getKey();
-        Node child = (Node) e.getValue();
-        kidList.add(new Bean(label + token, child));
+        kidList.add(new Bean(label + entry.getKey(), entry.getValue()));
       }
+      
       Collections.sort(kidList);
       return kidList;
     }
@@ -187,7 +183,7 @@
   
   // must be public for introspection;  must be serializable
   // for storing on the session.
-  public static final class Bean implements Comparable, Serializable
+  public static final class Bean implements Comparable<Bean>, Serializable
   {
     // No-arg constructor just for serialization
     public Bean()
@@ -197,12 +193,12 @@
     public Bean(String label, Node node)
     {
       String fn = node.filename;
-      List kids = _createChildList(node, label);
+      List<Bean> kids = _createChildList(node, label);
       // if this bean has no demo, and it has only one child, then pull
       // the child up to this bean's level:
       if ((fn==null) && (kids != null) && (kids.size() == 1))
       {
-        Bean child = (Bean) kids.get(0);
+        Bean child = kids.get(0);
         fn = child.getFilename();
         _token = child.getLabel();
         kids = null;
@@ -216,10 +212,9 @@
       _kids = kids;
     }
 
-    public int compareTo(Object obj)
+    public int compareTo(Bean obj)
     {
-      Bean other = (Bean) obj;
-      return getLabel().compareTo(other.getLabel());
+      return getLabel().compareTo(obj.getLabel());
     }
 
     /**
@@ -248,7 +243,7 @@
       return _token;
     }
     
-    public List getComponents()
+    public List<Bean> getComponents()
     {
       return _kids;
     }
@@ -264,15 +259,15 @@
     
     private String _filename;
     private String _token;
-    private List _kids;
+    private List<Bean> _kids;
   }
   
   private static final class Node
   {
     public String filename = null;
-    public Map kids = null;
+    public Map<String, Node> kids = null;
   }
    
-  private List _components = null;
-  private List _fileList = null; 
+  private List<Bean> _components = null;
+  private List<String> _fileList = null; 
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CustomMessageConvertValidateBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CustomMessageConvertValidateBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CustomMessageConvertValidateBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/CustomMessageConvertValidateBean.java Mon Aug  7 17:44:54 2006
@@ -120,7 +120,7 @@
     _color = colorValue;
   }
 
-  public Map getMessages()
+  public Map<String, String> getMessages()
   {
     return _messages;
   }
@@ -146,7 +146,7 @@
 
   private DateFormat _dft = DateFormat.getDateInstance();
 
-  private Map _messages = new HashMap();
+  private Map<String, String> _messages = new HashMap<String, String>();
 
   private Color _color = new Color(255,0,0);
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java Mon Aug  7 17:44:54 2006
@@ -34,6 +34,7 @@
    * selected and the others become deselected.
    * @param event the ActionEvent associated with the action
    */
+  @SuppressWarnings("unchecked")
   public void navigationItemAction(ActionEvent event)
   {
     UIComponent actionItem = event.getComponent();

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoTreeData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoTreeData.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoTreeData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoTreeData.java Mon Aug  7 17:44:54 2006
@@ -24,7 +24,7 @@
  * @author ADF Faces Team
  */
 
-public class DemoTreeData extends ArrayList
+public class DemoTreeData extends ArrayList<TreeNodeImpl>
 {
 
   // data
@@ -59,7 +59,7 @@
 
     add(node_0);
 
-    ArrayList list_0 = new ArrayList();
+    ArrayList<TreeNodeImpl> list_0 = new ArrayList<TreeNodeImpl>();
     list_0.add(node_0_0);
     list_0.add(node_0_1);
     list_0.add(node_0_2);
@@ -68,16 +68,16 @@
     list_0.add(node_0_5);
     node_0.setChildren(list_0);
 
-    ArrayList list_0_0 = new ArrayList();
+    ArrayList<TreeNodeImpl> list_0_0 = new ArrayList<TreeNodeImpl>();
     list_0_0.add(node_0_0_0);
     list_0_0.add(node_0_0_1);
     node_0_0.setChildren(list_0_0);
 
-    ArrayList list_0_0_0 = new ArrayList();
+    ArrayList<TreeNodeImpl> list_0_0_0 = new ArrayList<TreeNodeImpl>();
     list_0_0_0.add(node_0_0_0_0);
     node_0_0_0.setChildren(list_0_0_0);
 
-    ArrayList list_0_1 = new ArrayList();
+    ArrayList<TreeNodeImpl> list_0_1 = new ArrayList<TreeNodeImpl>();
     list_0_1.add(node_0_1_0);
     list_0_1.add(node_0_1_1);
     node_0_1.setChildren(list_0_1);

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/InfiniteTree.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/InfiniteTree.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/InfiniteTree.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/InfiniteTree.java Mon Aug  7 17:44:54 2006
@@ -20,7 +20,7 @@
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
 
-public class InfiniteTree extends AbstractList implements Serializable
+public class InfiniteTree extends AbstractList<InfiniteTree.Bean> implements Serializable
 {
   public InfiniteTree(String id)
   {
@@ -32,12 +32,14 @@
     this("");
   }
 
+  @Override
   public int size()
   {
     return _GENES.length;
   }
 
-  public Object get(int index)
+  @Override
+  public Bean get(int index)
   {
     return new Bean(index);
   }
@@ -79,7 +81,7 @@
       return getLabel().length();
     }
 
-    public List getKids()
+    public List<InfiniteTree.Bean> getKids()
     {
       return new InfiniteTree(getLabel());
     }



Mime
View raw message