svn commit: rev 76194 - jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl

[dl...@apache.org]

Author: dlr
Date: Wed Nov 17 16:08:34 2004
New Revision: 76194

Modified:
   jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSL.java
   jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSLTask.java
Log:
* src/java/org/apache/tools/dvsl/DVSL.java
  setStylesheet(String), setStylesheet(File): Delegate to new overload.

  setStylesheet(File, String): Use an InputStreamReader if an alternate
  character encoding is specified.  Removed worthless catch block.


* src/java/org/apache/tools/dvsl/DVSLTask.java
  stylesheetEncoding: Stores file encoding.

  execute(): Pass stylesheetEncoding to DVSL instance.

  setStyleEncoding(String): Mutator method for new encoding.


Issue: http://issues.apache.org/bugzilla/show_bug.cgi?id=32247
Submitted by: Takayoshi Kimura


Modified: jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSL.java
==============================================================================
--- jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSL.java	(original)
+++ jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSL.java	Wed Nov 17 16:08:34 2004
@@ -312,7 +312,7 @@
     public void setStylesheet(String stylesheet)
         throws Exception
     {
-        setStylesheet(new File(stylesheet));
+        setStylesheet(new File(stylesheet), null);
     }
 
     /**
@@ -321,17 +321,30 @@
     public void setStylesheet(File stylesheet)
         throws Exception
     {
-        FileReader fr = null;
+        setStylesheet(stylesheet, null);
+    }
+
+    /**
+     *  Convenience function.  See...
+     */
+    public void setStylesheet(File stylesheet, String stylesheetEncoding)
+        throws Exception
+    {
+        Reader fr = null;
 
         try
         {
-            fr = new FileReader(stylesheet);
+            if (stylesheetEncoding != null)
+            {
+                fr = new InputStreamReader(
+                    new FileInputStream(stylesheet), stylesheetEncoding);
+            }
+            else
+            {
+                fr = new FileReader(stylesheet);
+            }
 
             setStylesheet(fr);
-        }
-        catch(Exception e)
-        {
-            throw e;
         }
         finally
         {

Modified: jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSLTask.java
==============================================================================
--- jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSLTask.java	(original)
+++ jakarta/velocity-dvsl/trunk/src/java/org/apache/tools/dvsl/DVSLTask.java	Wed Nov 17 16:08:34 2004
@@ -137,6 +137,7 @@
     private File destDir = null;
     private File baseDir = null;
     private File stylesheet = null;
+    private String stylesheetEncoding = null;
     private File inFile = null;
     private File outFile = null;
     private File logFile = null;
@@ -282,7 +283,7 @@
         try
         {
             log("Loading stylesheet " + stylesheet, Project.MSG_INFO);
-            dvsl.setStylesheet(stylesheet);
+            dvsl.setStylesheet(stylesheet, stylesheetEncoding);
         }
         catch (Exception ex)
         {
@@ -416,6 +417,15 @@
     public void setStyle(File dvslFile)
     {
         this.stylesheet = dvslFile;
+    }
+
+    /**
+     * Sets the encoding of stylesheet file.
+     * @param dvslFileEncoding encoding of stylesheet file
+     */
+    public void setStyleEncoding(String dvslFileEncoding)
+    {
+        this.stylesheetEncoding = dvslFileEncoding;
     }
 
     /**

---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org