[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2 JSFUtils.java

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/06/28 18:56:38

  Modified:    andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
                        JSFUseCaseLogicImpl.java JSFForwardLogicImpl.java
               andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2
                        JSFUtils.java
  Log:
  minor cleanup
  
  Revision  Changes    Path
  1.10      +3 -2      cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java
  
  Index: JSFUseCaseLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- JSFUseCaseLogicImpl.java	26 Apr 2008 17:36:15 -0000	1.9
  +++ JSFUseCaseLogicImpl.java	29 Jun 2008 01:56:38 -0000	1.10
  @@ -509,9 +509,10 @@
       /**
        * @see org.andromda.cartridges.jsf2.metafacades.JSFUseCase#getAllForwards()
        */
  +    @SuppressWarnings("unchecked")
       protected List handleGetAllForwards()
       {
  -        final Map forwards = new LinkedHashMap();
  +        final Map<String, ModelElementFacade> forwards = new LinkedHashMap<String, ModelElementFacade>();
           for (final Iterator iterator = this.getActionForwards().iterator(); iterator.hasNext();)
           {
               final ModelElementFacade forward = (ModelElementFacade)iterator.next();
  @@ -896,7 +897,7 @@
       @Override
       protected String handleGetPortletViewPath()
       {
  -        return this.getInitialTargetPath();
  +        return this.getPath();
       }
   
       @SuppressWarnings("unchecked")
  
  
  
  1.2       +9 -8      cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFForwardLogicImpl.java
  
  Index: JSFForwardLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFForwardLogicImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- JSFForwardLogicImpl.java	5 Dec 2006 19:39:09 -0000	1.1
  +++ JSFForwardLogicImpl.java	29 Jun 2008 01:56:38 -0000	1.2
  @@ -81,9 +81,10 @@
        * @return maps message keys to message values, but only those that match the arguments
        *         will have been recorded
        */
  -    private Map getMessages(String taggedValue)
  +    @SuppressWarnings("unchecked")
  +    private Map<String, String> getMessages(String taggedValue)
       {
  -        Map messages;
  +        Map<String, String> messages;
   
           final Collection taggedValues = this.findTaggedValues(taggedValue);
           if (taggedValues.isEmpty())
  @@ -92,7 +93,7 @@
           }
           else
           {
  -            messages = new LinkedHashMap(); // we want to keep the order
  +            messages = new LinkedHashMap<String, String>(); // we want to keep the order
   
               for (final Iterator iterator = taggedValues.iterator(); iterator.hasNext();)
               {
  
  
  
  1.7       +6 -6      cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java
  
  Index: JSFUtils.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/JSFUtils.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- JSFUtils.java	21 Mar 2008 16:07:13 -0000	1.6
  +++ JSFUtils.java	29 Jun 2008 01:56:38 -0000	1.7
  @@ -56,7 +56,7 @@
        * @return returns a list of String instances or an empty list
        * @throws IllegalArgumentException when the input string does not match the required pattern
        */
  -    public static List parseValidatorArgs(String validatorTaggedValue)
  +    public static List<String> parseValidatorArgs(String validatorTaggedValue)
       {
           if (validatorTaggedValue == null)
           {
  @@ -72,7 +72,7 @@
                   "@andromda.presentation.view.field.format?): " + validatorTaggedValue);
           }
   
  -        final List validatorArgs = new ArrayList();
  +        final List<String> validatorArgs = new ArrayList<String>();
   
           // only keep what is between parentheses (if any)
           int left = validatorTaggedValue.indexOf('(');
  @@ -122,7 +122,7 @@
               throw new IllegalArgumentException("Illegal validator tagged value: " + validatorTaggedValue);
           }
   
  -        final List validatorVars = new ArrayList();
  +        final List<String> validatorVars = new ArrayList<String>();
   
           // only keep what is between parentheses (if any)
           int left = validatorTaggedValue.indexOf('(');
  @@ -583,7 +583,7 @@
           final ModelElementFacade element,
           final ClassifierFacade type)
       {
  -        final Collection validatorTypesList = new ArrayList();
  +        final Collection<String> validatorTypesList = new ArrayList<String>();
           if (element != null && type != null)
           {
               final String format = JSFUtils.getInputFormat(element);
  @@ -721,7 +721,7 @@
           final ClassifierFacade type,
           final ParameterFacade ownerParameter)
       {
  -        final Map vars = new LinkedHashMap();
  +        final Map<String, Object> vars = new LinkedHashMap<String, Object>();
           if (element != null && type != null)
           {
               final String format = JSFUtils.getInputFormat(element);
  @@ -866,7 +866,7 @@
           final ModelElementFacade element,
           final java.lang.String validatorType)
       {
  -        final Collection args = new ArrayList();
  +        final Collection<Object> args = new ArrayList<Object>();
           if ("intRange".equals(validatorType) || "floatRange".equals(validatorType) ||
               "doubleRange".equals(validatorType))
           {