Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
820f2806ec | ||
|
808bdf6079 | ||
|
eac1d8d055 | ||
|
d5a88b8be4 | ||
|
fd5d554171 | ||
|
6d18be3df8 |
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<artifactId>enjoy</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>enjoy</name>
|
||||
<version>3.7</version>
|
||||
<version>3.8</version>
|
||||
<url>http://www.jfinal.com</url>
|
||||
<description>Enjoy is a simple, light, rapid, independent, extensible Java Template Engine.</description>
|
||||
|
||||
|
@@ -17,7 +17,6 @@
|
||||
package com.jfinal.template;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
@@ -117,16 +116,10 @@ public class Template {
|
||||
* 适用于代码生成器类似应用场景
|
||||
*/
|
||||
public void render(Map<?, ?> data, File file) {
|
||||
FileOutputStream fos = null;
|
||||
try {
|
||||
fos = new FileOutputStream(file);
|
||||
try (FileOutputStream fos = new FileOutputStream(file)) {
|
||||
render(data, fos);
|
||||
} catch (FileNotFoundException e) {
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
} finally {
|
||||
if (fos != null) {
|
||||
try {fos.close();} catch (IOException e) {e.printStackTrace(System.err);}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -18,7 +18,6 @@ package com.jfinal.template.source;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.URL;
|
||||
@@ -141,9 +140,8 @@ public class ClassPathSource implements ISource {
|
||||
|
||||
public static StringBuilder loadFile(InputStream inputStream, String encoding) {
|
||||
StringBuilder ret = new StringBuilder();
|
||||
BufferedReader br = null;
|
||||
try {
|
||||
br = new BufferedReader(new InputStreamReader(inputStream, encoding));
|
||||
|
||||
try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, encoding))) {
|
||||
// br = new BufferedReader(new FileReader(fileName));
|
||||
String line = br.readLine();
|
||||
if (line != null) {
|
||||
@@ -159,16 +157,6 @@ public class ClassPathSource implements ISource {
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
finally {
|
||||
if (br != null) {
|
||||
try {
|
||||
br.close();
|
||||
} catch (IOException e) {
|
||||
// com.jfinal.kit.LogKit.error(e.getMessage(), e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
|
@@ -19,7 +19,6 @@ 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.EngineConfig;
|
||||
|
||||
@@ -92,9 +91,8 @@ public class FileSource implements ISource {
|
||||
|
||||
public static StringBuilder loadFile(File file, String encoding) {
|
||||
StringBuilder ret = new StringBuilder((int)file.length() + 3);
|
||||
BufferedReader br = null;
|
||||
try {
|
||||
br = new BufferedReader(new InputStreamReader(new FileInputStream(file), encoding));
|
||||
|
||||
try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), encoding))) {
|
||||
// br = new BufferedReader(new FileReader(fileName));
|
||||
String line = br.readLine();
|
||||
if (line != null) {
|
||||
@@ -110,16 +108,6 @@ public class FileSource implements ISource {
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
finally {
|
||||
if (br != null) {
|
||||
try {
|
||||
br.close();
|
||||
} catch (IOException e) {
|
||||
// com.jfinal.kit.LogKit.error(e.getMessage(), e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
|
Reference in New Issue
Block a user