[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms formImplMacros.vm FormImpl.java.vsl

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

  User: cwbrandon
  Date: 08/05/30 08:04:31

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/forms
                        formImplMacros.vm FormImpl.java.vsl
  Log:
  get rid of warnings on date formatter code
  
  Revision  Changes    Path
  1.2       +6 -7      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/formImplMacros.vm
  
  Index: formImplMacros.vm
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/formImplMacros.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- formImplMacros.vm	5 Dec 2006 19:39:26 -0000	1.1
  +++ formImplMacros.vm	30 May 2008 15:04:31 -0000	1.2
  @@ -136,11 +136,10 @@
   #end
   #set ($lenient = !$field.strictDateFormat)
   #if ($field.type.dateType)
  -        java.text.DateFormat $dateFormatter = new java.text.SimpleDateFormat("$field.format");
  +        final java.text.DateFormat $dateFormatter = new java.text.SimpleDateFormat("$field.format");
           ${dateFormatter}.setLenient($lenient);
           this.dateTimeFormatters.put("$fieldName", $dateFormatter);
   #elseif ($field.type.timeType)
  -        java.text.DateFormat $timeFormatter = new java.text.SimpleDateFormat("$field.format");
  -        this.dateTimeFormatters.put("$fieldName", $timeFormatter);
  +        this.dateTimeFormatters.put("$fieldName", new java.text.SimpleDateFormat("$field.format");
   #end
   #end
  
  
  
  1.8       +4 -3      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl
  
  Index: FormImpl.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -r1.7 -r1.8
  --- FormImpl.java.vsl	28 May 2008 19:04:33 -0000	1.7
  +++ FormImpl.java.vsl	30 May 2008 15:04:31 -0000	1.8
  @@ -20,7 +20,7 @@
   #end
   #end
           // - setup the default java.util.Date.toString() formatter
  -        java.text.DateFormat dateFormatter = new java.text.SimpleDateFormat("EEE MMM dd hh:mm:ss zzz yyyy");
  +        final java.text.DateFormat dateFormatter = new java.text.SimpleDateFormat("EEE MMM dd hh:mm:ss zzz yyyy");
           dateFormatter.setLenient(true);
           this.dateTimeFormatters.put(null, dateFormatter);
       }
  @@ -111,7 +111,8 @@
       /**
        * Stores any date or time formatters for this form.
        */
  -    private final java.util.Map dateTimeFormatters = new java.util.HashMap();
  +    private final java.util.Map<java.lang.String, java.text.DateFormat> dateTimeFormatters =
  +        new java.util.HashMap<java.lang.String, java.text.DateFormat>();
   
       /**
        * Gets any date and time formatters (keyed by property name)
  @@ -119,7 +120,7 @@
        *
        * @return the Map containing any date and time formatters.
        */
  -    public java.util.Map getDateTimeFormatters()
  +    public java.util.Map<java.lang.String, java.text.DateFormat> getDateTimeFormatters()
       {
           return this.dateTimeFormatters;
       }