Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jason White 2015-09-08 18:39:08 -04:00
commit 9fa79292b1

View File

@ -10,7 +10,6 @@ import java.nio.file.Files;
import java.nio.file.OpenOption; import java.nio.file.OpenOption;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -76,7 +75,7 @@ public class PluginFileUtils {
byte[] fileAsBytes = Files.readAllBytes(file); byte[] fileAsBytes = Files.readAllBytes(file);
String fileAsString = new String(fileAsBytes); String fileAsString = new String(fileAsBytes);
fileAsString = fileAsString.replaceAll(replace, with); fileAsString = fileAsString.replaceAll(replace, with);
Files.write(file, fileAsString.getBytes(), StandardOpenOption.TRUNCATE_EXISTING); Files.write(file, fileAsString.getBytes());
} }
public static void writeFile(Path targetFile, byte[] bytes, OpenOption... options) throws IOException { public static void writeFile(Path targetFile, byte[] bytes, OpenOption... options) throws IOException {