[WebMacro-cvs] webmacro/src/org/webmacro/resource URLTemplate.java, 1.11, 1.12

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26638/src/org/webmacro/resource

Modified Files:
	URLTemplate.java 
Log Message:
Checkstyle: organise imports

Index: URLTemplate.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/URLTemplate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** URLTemplate.java	31 Oct 2005 02:46:41 -0000	1.11
--- URLTemplate.java	20 Mar 2008 12:30:09 -0000	1.12
***************
*** 23,26 ****
--- 23,37 ----
  package org.webmacro.resource;
  
+ import java.io.BufferedReader;
+ import java.io.File;
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.InputStreamReader;
+ import java.io.Reader;
+ import java.net.URL;
+ import java.util.HashMap;
+ import java.util.Locale;
+ import java.util.Properties;
+ 
  import org.webmacro.Broker;
  import org.webmacro.TemplateException;
***************
*** 30,39 ****
  import org.webmacro.util.NativeAsciiReader;
  
- import java.io.*;
- import java.net.URL;
- import java.util.HashMap;
- import java.util.Locale;
- import java.util.Properties;
- 
  /**
   * FileTemplate objects read their template data from a text file.
--- 41,44 ----
***************
*** 43,50 ****
  {
  
!     /**
!      * CVS revision
!      */
! 
      public static final String RCS = "@(#) $Id$";
  
--- 48,52 ----
  {
  
!     /** CVS revision  */
      public static final String RCS = "@(#) $Id$";
  
***************
*** 52,74 ****
       * The location of the resourse (file) this template was read from.
       */
- 
      private final URL _url;
  
      /**
!      * The physical file referred to by "file:" and "jar:" URLs
       */
- 
      private File underLyingFile = null;
  
      /**
!      * The time the underlying file was last modified
       */
- 
      private long underLyingFileLastModTime = 0;
  
      /**
!      * Cache for any per-directory encoding files
       */
- 
      private final HashMap propertiesCache = new HashMap();
  
--- 54,72 ----
       * The location of the resourse (file) this template was read from.
       */
      private final URL _url;
  
      /**
!      * The physical file referred to by "file:" and "jar:" URLs.
       */
      private File underLyingFile = null;
  
      /**
!      * The time the underlying file was last modified.
       */
      private long underLyingFileLastModTime = 0;
  
      /**
!      * Cache for any per-directory encoding files.
       */
      private final HashMap propertiesCache = new HashMap();
  
***************
*** 78,84 ****
  
      /**
!      * A dummy object used as a place holder in the encoding cache
       */
- 
      private static final Object dummy = new Object();
  
--- 76,81 ----
  
      /**
!      * A dummy object used as a place holder in the encoding cache.
       */
      private static final Object dummy = new Object();
  
***************
*** 91,98 ****
       *        jar:xxxxxx!yyyyyy
       *</pre>
!      * extracting the xxxxxx.  In the latter case the reference is to the jar containing the
       * template.
       */
- 
      public URLTemplate (
              Broker broker,
--- 88,95 ----
       *        jar:xxxxxx!yyyyyy
       *</pre>
!      * extracting the xxxxxx.  
!      * In the latter case the reference is to the jar containing the
       * template.
       */
      public URLTemplate (
              Broker broker,
***************
*** 130,134 ****
       * Imply a reference to the actual file.
       */
- 
      public boolean shouldReload ()
      {
--- 127,130 ----
***************
*** 147,151 ****
       * if the file changes
       */
- 
      private void setupLocalProperties ()
      {
--- 143,146 ----
***************
*** 230,234 ****
  
      /**
!      * return the URL for the current template.
       */
      public URL getURL ()
--- 225,229 ----
  
      /**
!      * @return the URL for the current template
       */
      public URL getURL ()