lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-24 18:04:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-02-28 21:55:52 +08:00
parent 28777b69b7
commit daa618ef3d
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java
View File

@ -32,9 +32,7 @@ import java.io.BufferedReader;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.LineNumberReader; import java.io.LineNumberReader;
@ -1790,8 +1788,7 @@ public class FileUtil extends PathUtil {
*/ */
public static BOMInputStream getBOMInputStream(final File file) throws IORuntimeException { public static BOMInputStream getBOMInputStream(final File file) throws IORuntimeException {
try { try {
//noinspection IOStreamConstructor return new BOMInputStream(Files.newInputStream(file.toPath()));
return new BOMInputStream(new FileInputStream(file));
} catch (final IOException e) { } catch (final IOException e) {
throw new IORuntimeException(e); throw new IORuntimeException(e);
} }
@ -2335,8 +2332,7 @@ public class FileUtil extends PathUtil {
public static BufferedOutputStream getOutputStream(final File file) throws IORuntimeException { public static BufferedOutputStream getOutputStream(final File file) throws IORuntimeException {
final OutputStream out; final OutputStream out;
try { try {
//noinspection IOStreamConstructor out = Files.newOutputStream(touch(file).toPath());
out = new FileOutputStream(touch(file));
} catch (final IOException e) { } catch (final IOException e) {
throw new IORuntimeException(e); throw new IORuntimeException(e);
} }

10
hutool-core/src/main/java/cn/hutool/core/io/file/FileWriter.java
View File

@ -4,8 +4,8 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.text.StrUtil; import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.CharsetUtil;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.BufferedWriter; import java.io.BufferedWriter;
@ -13,9 +13,11 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -336,9 +338,9 @@ public class FileWriter extends FileWrapper {
* @since 5.5.2 * @since 5.5.2
*/ */
public File writeFromStream(final InputStream in, final boolean isCloseIn) throws IORuntimeException { public File writeFromStream(final InputStream in, final boolean isCloseIn) throws IORuntimeException {
FileOutputStream out = null; OutputStream out = null;
try { try {
out = new FileOutputStream(FileUtil.touch(file)); out = Files.newOutputStream(FileUtil.touch(file).toPath());
IoUtil.copy(in, out); IoUtil.copy(in, out);
} catch (final IOException e) { } catch (final IOException e) {
throw new IORuntimeException(e); throw new IORuntimeException(e);
@ -359,7 +361,7 @@ public class FileWriter extends FileWrapper {
*/ */
public BufferedOutputStream getOutputStream() throws IORuntimeException { public BufferedOutputStream getOutputStream() throws IORuntimeException {
try { try {
return new BufferedOutputStream(new FileOutputStream(FileUtil.touch(file))); return new BufferedOutputStream(Files.newOutputStream(FileUtil.touch(file).toPath()));
} catch (final IOException e) { } catch (final IOException e) {
throw new IORuntimeException(e); throw new IORuntimeException(e);
} }

6
hutool-swing/src/main/java/cn/hutool/swing/img/gif/AnimatedGifEncoder.java
View File

@ -5,9 +5,10 @@ import java.awt.Graphics2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.DataBufferByte; import java.awt.image.DataBufferByte;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
/** /**
* 动态GIF动画生成器，可生成一个或多个帧的GIF。 * 动态GIF动画生成器，可生成一个或多个帧的GIF。
@ -296,8 +297,7 @@ public class AnimatedGifEncoder {
public boolean start(final String file) { public boolean start(final String file) {
boolean ok; boolean ok;
try { try {
//noinspection IOStreamConstructor out = new BufferedOutputStream(Files.newOutputStream(Paths.get(file)));
out = new BufferedOutputStream(new FileOutputStream(file));
ok = start(out); ok = start(out);
closeStream = true; closeStream = true;
} catch (final IOException e) { } catch (final IOException e) {

5
hutool-swing/src/main/java/cn/hutool/swing/img/gif/GifDecoder.java
View File

@ -10,10 +10,11 @@ import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt; import java.awt.image.DataBufferInt;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
@ -339,7 +340,7 @@ public class GifDecoder {
final URL url = new URL(name); final URL url = new URL(name);
in = new BufferedInputStream(url.openStream()); in = new BufferedInputStream(url.openStream());
} else { } else {
in = new BufferedInputStream(new FileInputStream(name)); in = new BufferedInputStream(Files.newInputStream(Paths.get(name)));
} }
status = read(in); status = read(in);
} catch (final IOException e) { } catch (final IOException e) {