148a149,155
>   /** Placeholder in template that is to be replaced w/ datePattern output */
>   protected static final String DATE_PLACEHOLDER = "%d";
> 
>   /** File name template.  Used to generate current/schedule file names. */
>   private String m_fileNameTemplate;
> 
> 
195a203
>     // Note: Overwrite fileName later
197a206,209
> 
>     // Patch fileName to be final value [using resolveFileName()]
>     setFile(filename);
> 
224c236
<       scheduledFilename = fileName+sdf.format(new Date(file.lastModified()));
---
>       scheduledFilename = resolveFileName(new Date(file.lastModified()));
304c316
<     String datedFilename = fileName+sdf.format(now);
---
>     String datedFilename = resolveFileName(now);
360a373,414
> 
>   @Override
>   public void setFile(String file) {
>      m_fileNameTemplate = createCompleteTemplate(file);
>      super.setFile(resolveFileName(null));
>   }
> 
>   private String resolveFileName(Date date) {
>      return resolveFileName(m_fileNameTemplate, date);
>   }
> 
>   /**
>    * Resolve file name.
>    * May be overridden by subclasses to add more placeholders.
>    *
>    * @param fileNameTemplate  [in] (non-null) file name template
>    * @param date  [in] (nullable)
>    *                 is null if current file,
>    *                 else date for schedule file
>    *
>    * @return resolved file name
>    */
>   protected String resolveFileName(String fileNameTemplate, Date date) {
>      return fileNameTemplate.replaceAll(
>            DATE_PLACEHOLDER,
>            date == null ? "" : sdf.format(date));
>   }
> 
>   /**
>    * Create complete file name template.
>    * May be overridden by subclasses to add more placeholders.
>    * Adds implicit placeholders.
>    *
>    * @return complete file name template
>    */
>   protected String createCompleteTemplate(String file) {
>      // For reverse compatibility, add implied %d at end
> 
>      return file.contains(DATE_PLACEHOLDER)
>         ? file
>         : file + DATE_PLACEHOLDER;
>   }