FileStringSource 更名为 FileSource

src/main/java/com/jfinal/template/Engine.java

@@ -22,6 +22,7 @@ import java.util.Map;
 import com.jfinal.kit.HashKit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.template.expr.ast.MethodKit;
+import com.jfinal.template.source.FileSource;
 import com.jfinal.template.source.ISource;
 import com.jfinal.template.stat.Parser;
 import com.jfinal.template.stat.ast.Stat;
@@ -132,23 +133,23 @@ public class Engine {
 		
 		Template template = templateCache.get(fileName);
 		if (template == null) {
-			template = buildTemplateByFileStringSource(fileName);
+			template = buildTemplateByFileSource(fileName);
 			templateCache.put(fileName, template);
 		} else if (devMode) {
 			if (template.isModified()) {
-				template = buildTemplateByFileStringSource(fileName);
+				template = buildTemplateByFileSource(fileName);
 				templateCache.put(fileName, template);
 			}
 		}
 		return template;
 	}
 	
-	private Template buildTemplateByFileStringSource(String fileName) {
-		FileStringSource fileStringSource = new FileStringSource(config.getBaseTemplatePath(), fileName, config.getEncoding());
+	private Template buildTemplateByFileSource(String fileName) {
+		FileSource fileSource = new FileSource(config.getBaseTemplatePath(), fileName, config.getEncoding());
 		Env env = new Env(config);
-		Parser parser = new Parser(env, fileStringSource.getContent(), fileName);
+		Parser parser = new Parser(env, fileSource.getContent(), fileName);
 		if (devMode) {
-			env.addSource(fileStringSource);
+			env.addSource(fileSource);
 		}
 		Stat stat = parser.parse();
 		Template template = new Template(env, stat);

src/main/java/com/jfinal/template/EngineConfig.java

@@ -27,6 +27,7 @@ import com.jfinal.template.expr.ast.ExprList;
 import com.jfinal.template.expr.ast.SharedMethodKit;
 import com.jfinal.template.ext.directive.*;
 import com.jfinal.template.ext.sharedmethod.Json;
+import com.jfinal.template.source.FileSource;
 import com.jfinal.template.source.ISource;
 import com.jfinal.template.stat.Location;
 import com.jfinal.template.stat.Parser;
@@ -72,8 +73,8 @@ public class EngineConfig {
 	 * Add shared function with file
 	 */
 	public void addSharedFunction(String fileName) {
-		FileStringSource fileStringSource = new FileStringSource(baseTemplatePath, fileName, encoding);
-		doAddSharedFunction(fileStringSource, fileName);
+		FileSource fileSource = new FileSource(baseTemplatePath, fileName, encoding);
+		doAddSharedFunction(fileSource, fileName);
 	}
 	
 	private synchronized void doAddSharedFunction(ISource source, String fileName) {
@@ -109,7 +110,7 @@ public class EngineConfig {
 	 * Add shared function by ISource
 	 */
 	public void addSharedFunction(ISource source) {
-		String fileName = source instanceof FileStringSource ? ((FileStringSource)source).getFileName() : null;
+		String fileName = source instanceof FileSource ? ((FileSource)source).getFileName() : null;
 		doAddSharedFunction(source, fileName);
 	}
 	
@@ -171,7 +172,7 @@ public class EngineConfig {
 		Map<String, Define> newMap = new HashMap<String, Define>();
 		for (int i = 0, size = sharedFunctionSourceList.size(); i < size; i++) {
 			ISource source = sharedFunctionSourceList.get(i);
-			String fileName = source instanceof FileStringSource ? ((FileStringSource)source).getFileName() : null;
+			String fileName = source instanceof FileSource ? ((FileSource)source).getFileName() : null;
 			
 			Env env = new Env(this);
 			new Parser(env, source.getContent(), fileName).parse();

src/main/java/com/jfinal/template/ext/directive/RenderDirective.java

@@ -22,10 +22,10 @@ import java.util.Map;
 import com.jfinal.template.Directive;
 import com.jfinal.template.EngineConfig;
 import com.jfinal.template.Env;
-import com.jfinal.template.FileStringSource;
 import com.jfinal.template.TemplateException;
 import com.jfinal.template.expr.ast.Assign;
 import com.jfinal.template.expr.ast.ExprList;
+import com.jfinal.template.source.FileSource;
 import com.jfinal.template.source.ISource;
 import com.jfinal.template.stat.Ctrl;
 import com.jfinal.template.stat.ParseException;
@@ -126,12 +126,12 @@ public class RenderDirective extends Directive {
 	
 	private StatInfo parseStatInfo(Env env, String subFileName) {
 		EngineConfig config = env.getEngineConfig();
-		FileStringSource fileStringSource = new FileStringSource(config.getBaseTemplatePath(), subFileName, config.getEncoding());
+		FileSource fileSource = new FileSource(config.getBaseTemplatePath(), subFileName, config.getEncoding());
 		
 		try {
 			EnvSub envSub = new EnvSub(env);
-			Stat stat = new Parser(envSub, fileStringSource.getContent(), subFileName).parse();
-			return new StatInfo(envSub, stat, fileStringSource);
+			Stat stat = new Parser(envSub, fileSource.getContent(), subFileName).parse();
+			return new StatInfo(envSub, stat, fileSource);
 		} catch (Exception e) {
 			throw new ParseException(e.getMessage(), location, e);
 		}

src/main/java/com/jfinal/template/FileStringSource.java

@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package com.jfinal.template;
+package com.jfinal.template.source;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import com.jfinal.template.source.ISource;
+
+import com.jfinal.template.EngineConfig;
 
 /**
- * FileStringSource
+ * FileSource
  */
-public class FileStringSource implements ISource {
+public class FileSource implements ISource {
 	
 	private String finalFileName;
 	private String fileName;
@@ -34,13 +35,13 @@ public class FileStringSource implements ISource {
 	
 	private long lastModified;
 	
-	public FileStringSource(String baseTemplatePath, String fileName, String encoding) {
+	public FileSource(String baseTemplatePath, String fileName, String encoding) {
 		this.finalFileName = buildFinalFileName(baseTemplatePath, fileName);
 		this.fileName = fileName;
 		this.encoding= encoding;
 	}
 	
-	public FileStringSource(String baseTemplatePath, String fileName) {
+	public FileSource(String baseTemplatePath, String fileName) {
 		this(baseTemplatePath, fileName, EngineConfig.DEFAULT_ENCODING);
 	}
 	

src/main/java/com/jfinal/template/stat/ast/Include.java

@@ -19,11 +19,11 @@ package com.jfinal.template.stat.ast;
 import java.io.Writer;
 import com.jfinal.template.EngineConfig;
 import com.jfinal.template.Env;
-import com.jfinal.template.FileStringSource;
 import com.jfinal.template.expr.ast.Assign;
 import com.jfinal.template.expr.ast.Const;
 import com.jfinal.template.expr.ast.Expr;
 import com.jfinal.template.expr.ast.ExprList;
+import com.jfinal.template.source.FileSource;
 import com.jfinal.template.stat.Ctrl;
 import com.jfinal.template.stat.Location;
 import com.jfinal.template.stat.ParseException;
@@ -87,11 +87,11 @@ public class Include extends Stat {
 	private void parseSubTemplate(Env env, String fileName, String parentFileName, Location location) {
 		String subFileName = getSubFileName(fileName, parentFileName);
 		EngineConfig config = env.getEngineConfig();
-		FileStringSource fileStringSource = new FileStringSource(config.getBaseTemplatePath(), subFileName, config.getEncoding());
+		FileSource fileSource = new FileSource(config.getBaseTemplatePath(), subFileName, config.getEncoding());
 		try {
-			Parser parser = new Parser(env, fileStringSource.getContent(), subFileName);
+			Parser parser = new Parser(env, fileSource.getContent(), subFileName);
 			if (config.isDevMode()) {
-				env.addSource(fileStringSource);
+				env.addSource(fileSource);
 			}
 			this.stat = parser.parse();
 		} catch (Exception e) {