author | shade |
Tue, 15 Oct 2019 19:38:59 +0200 | |
changeset 58604 | 791217cdc433 |
parent 49254 | 422615764e12 |
permissions | -rw-r--r-- |
49254
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
1 |
/* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
2 |
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
4 |
* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
8 |
* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
13 |
* accompanied this code). |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
14 |
* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
18 |
* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
21 |
* questions. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
22 |
*/ |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
23 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
24 |
import java.io.File; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
25 |
import java.io.FileInputStream; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
26 |
import java.io.FileOutputStream; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
27 |
import java.io.FileReader; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
28 |
import java.io.FileWriter; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
29 |
import java.io.IOException; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
30 |
import java.io.OutputStreamWriter; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
31 |
import java.io.Reader; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
32 |
import java.nio.charset.Charset; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
33 |
import java.nio.charset.StandardCharsets; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
34 |
import org.testng.Assert; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
35 |
import org.testng.annotations.DataProvider; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
36 |
import org.testng.annotations.Test; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
37 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
38 |
/** |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
39 |
* @test |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
40 |
* @bug 8183554 |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
41 |
* @summary Test to verify the new Constructors that take a Charset. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
42 |
* @run testng ConstructorTest |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
43 |
*/ |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
44 |
public class ConstructorTest { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
45 |
static String USER_DIR = System.getProperty("user.dir", "."); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
46 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
47 |
public static enum ConstructorType { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
48 |
STRING, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
49 |
FILE, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
50 |
STRING_APPEND, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
51 |
FILE_APPEND |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
52 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
53 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
54 |
static final String TEST_STRING = "abc \u0100 \u0101 \u0555 \u07FD \u07FF"; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
55 |
static final int BUFFER_SIZE = 8192; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
56 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
57 |
@DataProvider(name = "parameters") |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
58 |
public Object[][] getParameters() throws IOException { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
59 |
File file1 = new File(USER_DIR, "FileWriterTest1.txt"); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
60 |
File file2 = new File(USER_DIR, "FileWriterTest2.txt"); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
61 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
62 |
return new Object[][]{ |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
63 |
{ConstructorType.STRING, file1, file2, StandardCharsets.UTF_8}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
64 |
{ConstructorType.FILE, file1, file2, StandardCharsets.UTF_8}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
65 |
{ConstructorType.STRING_APPEND, file1, file2, StandardCharsets.UTF_8}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
66 |
{ConstructorType.FILE_APPEND, file1, file2, StandardCharsets.UTF_8}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
67 |
{ConstructorType.STRING, file1, file2, StandardCharsets.ISO_8859_1}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
68 |
{ConstructorType.FILE, file1, file2, StandardCharsets.ISO_8859_1}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
69 |
{ConstructorType.STRING_APPEND, file1, file2, StandardCharsets.ISO_8859_1}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
70 |
{ConstructorType.FILE_APPEND, file1, file2, StandardCharsets.ISO_8859_1}, |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
71 |
}; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
72 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
73 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
74 |
/** |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
75 |
* Verifies that the new constructors that take a Charset function the same |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
76 |
* as an OutputStreamWriter on a FileOutputStream as was recommended before |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
77 |
* this change. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
78 |
* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
79 |
* @param type the type of the constructor |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
80 |
* @param file1 file1 to be written with a FileWriter |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
81 |
* @param file2 file2 to be written with an OutputStreamWriter |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
82 |
* @param charset the charset |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
83 |
* @throws IOException |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
84 |
*/ |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
85 |
@Test(dataProvider = "parameters") |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
86 |
void test(ConstructorType type, File file1, File file2, Charset charset) |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
87 |
throws Exception { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
88 |
writeWithFileWriter(type, file1, TEST_STRING, charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
89 |
writeWithOutputStreamWriter(type, file2, TEST_STRING, charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
90 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
91 |
try ( |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
92 |
FileReader r1 = getFileReader(type, file1, charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
93 |
FileReader r2 = getFileReader(type, file2, charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
94 |
) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
95 |
String result1 = readAll(r1, BUFFER_SIZE); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
96 |
String result2 = readAll(r2, BUFFER_SIZE); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
97 |
Assert.assertEquals(result1, result2); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
98 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
99 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
100 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
101 |
public String readAll(Reader reader, int bufferSize) throws IOException { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
102 |
StringBuilder sb = new StringBuilder(); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
103 |
char[] buf = new char[bufferSize]; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
104 |
int numRead; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
105 |
while ((numRead = reader.read(buf)) != -1) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
106 |
if (numRead == buf.length) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
107 |
sb.append(buf); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
108 |
} else { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
109 |
sb.append(String.valueOf(buf, 0, numRead)); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
110 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
111 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
112 |
return sb.toString(); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
113 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
114 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
115 |
/* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
116 |
* Creates a FileReader over the given input file. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
117 |
*/ |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
118 |
FileReader getFileReader(ConstructorType type, File file, Charset charset) |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
119 |
throws IOException { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
120 |
switch (type) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
121 |
case STRING: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
122 |
case STRING_APPEND: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
123 |
return new FileReader(file.getPath(), charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
124 |
case FILE: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
125 |
case FILE_APPEND: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
126 |
return new FileReader(file, charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
127 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
128 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
129 |
return null; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
130 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
131 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
132 |
/* |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
133 |
* Creates a FileWriter using the constructor as specified. |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
134 |
*/ |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
135 |
FileWriter getFileWriter(ConstructorType type, File file, Charset charset) |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
136 |
throws IOException { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
137 |
switch (type) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
138 |
case STRING: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
139 |
return new FileWriter(file.getPath(), charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
140 |
case FILE: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
141 |
return new FileWriter(file, charset); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
142 |
case STRING_APPEND: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
143 |
return new FileWriter(file.getPath(), charset, true); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
144 |
case FILE_APPEND: |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
145 |
return new FileWriter(file, charset, true); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
146 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
147 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
148 |
return null; |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
149 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
150 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
151 |
void writeWithFileWriter(ConstructorType type, File file, String content, Charset charset) |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
152 |
throws IOException { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
153 |
if (type == ConstructorType.STRING_APPEND || type == ConstructorType.FILE_APPEND) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
154 |
try (FileWriter writer = getFileWriter(ConstructorType.FILE, file, charset);) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
155 |
writer.write(content); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
156 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
157 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
158 |
try (FileWriter writer = getFileWriter(type, file, charset);) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
159 |
writer.write(content); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
160 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
161 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
162 |
|
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
163 |
void writeWithOutputStreamWriter(ConstructorType type, File file, String content, Charset charset) |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
164 |
throws IOException { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
165 |
try (OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), charset)) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
166 |
writer.write(content); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
167 |
if (type == ConstructorType.STRING_APPEND || type == ConstructorType.FILE_APPEND) { |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
168 |
writer.write(content); |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
169 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
170 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
171 |
} |
422615764e12
8183554: Add constructors with Charset parameter for FileReader and FileWriter
joehw
parents:
diff
changeset
|
172 |
} |