6 Commits

Author SHA1 Message Date
James
820f2806ec [maven-release-plugin] prepare release enjoy-3.8 2019-04-07 22:30:15 +08:00
James
808bdf6079 enjoy 3.8 2019-04-07 22:23:49 +08:00
James
eac1d8d055 enjoy 3.8 2019-04-07 21:45:28 +08:00
James
d5a88b8be4 enjoy 3.8 2019-04-07 21:36:00 +08:00
James
fd5d554171 enjoy 3.8 2019-04-07 21:34:21 +08:00
James
6d18be3df8 [maven-release-plugin] prepare for next development iteration 2019-03-19 16:31:01 +08:00
4 changed files with 7 additions and 38 deletions

View File

@@ -4,7 +4,7 @@
<artifactId>enjoy</artifactId> <artifactId>enjoy</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>enjoy</name> <name>enjoy</name>
<version>3.7</version> <version>3.8</version>
<url>http://www.jfinal.com</url> <url>http://www.jfinal.com</url>
<description>Enjoy is a simple, light, rapid, independent, extensible Java Template Engine.</description> <description>Enjoy is a simple, light, rapid, independent, extensible Java Template Engine.</description>

View File

@@ -17,7 +17,6 @@
package com.jfinal.template; package com.jfinal.template;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@@ -117,16 +116,10 @@ public class Template {
* 适用于代码生成器类似应用场景 * 适用于代码生成器类似应用场景
*/ */
public void render(Map<?, ?> data, File file) { public void render(Map<?, ?> data, File file) {
FileOutputStream fos = null; try (FileOutputStream fos = new FileOutputStream(file)) {
try {
fos = new FileOutputStream(file);
render(data, fos); render(data, fos);
} catch (FileNotFoundException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} finally {
if (fos != null) {
try {fos.close();} catch (IOException e) {e.printStackTrace(System.err);}
}
} }
} }

View File

@@ -18,7 +18,6 @@ package com.jfinal.template.source;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.URL; import java.net.URL;
@@ -141,9 +140,8 @@ public class ClassPathSource implements ISource {
public static StringBuilder loadFile(InputStream inputStream, String encoding) { public static StringBuilder loadFile(InputStream inputStream, String encoding) {
StringBuilder ret = new StringBuilder(); StringBuilder ret = new StringBuilder();
BufferedReader br = null;
try { try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, encoding))) {
br = new BufferedReader(new InputStreamReader(inputStream, encoding));
// br = new BufferedReader(new FileReader(fileName)); // br = new BufferedReader(new FileReader(fileName));
String line = br.readLine(); String line = br.readLine();
if (line != null) { if (line != null) {
@@ -159,16 +157,6 @@ public class ClassPathSource implements ISource {
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(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() { public String toString() {

View File

@@ -19,7 +19,6 @@ package com.jfinal.template.source;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import com.jfinal.template.EngineConfig; import com.jfinal.template.EngineConfig;
@@ -92,9 +91,8 @@ public class FileSource implements ISource {
public static StringBuilder loadFile(File file, String encoding) { public static StringBuilder loadFile(File file, String encoding) {
StringBuilder ret = new StringBuilder((int)file.length() + 3); StringBuilder ret = new StringBuilder((int)file.length() + 3);
BufferedReader br = null;
try { try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), encoding))) {
br = new BufferedReader(new InputStreamReader(new FileInputStream(file), encoding));
// br = new BufferedReader(new FileReader(fileName)); // br = new BufferedReader(new FileReader(fileName));
String line = br.readLine(); String line = br.readLine();
if (line != null) { if (line != null) {
@@ -110,16 +108,6 @@ public class FileSource implements ISource {
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(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() { public String toString() {