Skip to content

support setting specific charset for decoding source file or stream #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

support setting specific charset for decoding source file or stream #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions client.diff/src/main/java/com/github/gumtreediff/client/diff/swing/MappingsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ public MappingsPanel(String srcPath, String dstPath, TreeContext src, TreeContex
add(split);

try {
String charset = System.getProperty("gt.charset.decoding", "UTF-8");
txtSrc.getUI().getEditorKit(txtSrc).read(Files.newBufferedReader(Paths.get(srcPath),
Charset.forName("UTF-8")), txtSrc.getDocument(), 0);
Charset.forName(charset)), txtSrc.getDocument(), 0);
txtDst.getUI().getEditorKit(txtDst).read(Files.newBufferedReader(Paths.get(dstPath),
Charset.forName("UTF-8")), txtDst.getDocument(), 0);
Charset.forName(charset)), txtDst.getDocument(), 0);
} catch (IOException | BadLocationException e) {
e.printStackTrace();
}
Expand Down
5 changes: 3 additions & 2 deletions client.diff/src/main/java/com/github/gumtreediff/client/diff/web/HtmlDiffs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ public void produce() throws IOException {
}
}

String charset = System.getProperty("gt.charset.decoding", "UTF-8");
StringWriter w1 = new StringWriter();
BufferedReader r = Files.newBufferedReader(fSrc.toPath(), Charset.forName("UTF-8"));
BufferedReader r = Files.newBufferedReader(fSrc.toPath(), Charset.forName(charset));
int cursor = 0;

while (r.ready()) {
Expand All @@ -141,7 +142,7 @@ public void produce() throws IOException {
srcDiff = w1.toString();

StringWriter w2 = new StringWriter();
r = Files.newBufferedReader(fDst.toPath(), Charset.forName("UTF-8"));
r = Files.newBufferedReader(fDst.toPath(), Charset.forName(charset));
cursor = 0;

while (r.ready()) {
Expand Down
13 changes: 10 additions & 3 deletions core/src/main/java/com/github/gumtreediff/gen/TreeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,32 @@ public abstract class TreeGenerator {

protected abstract TreeContext generate(Reader r) throws IOException;

protected String charset = System.getProperty("gt.charset.decoding", "UTF-8");

public TreeContext generateFromReader(Reader r) throws IOException {
TreeContext ctx = generate(r);
ctx.validate();
return ctx;
}

public TreeContext generateFromFile(String path) throws IOException {
return generateFromReader(Files.newBufferedReader(Paths.get(path), Charset.forName("UTF-8")));
return generateFromReader(Files.newBufferedReader(Paths.get(path), Charset.forName(charset)));
}

public TreeContext generateFromFile(File file) throws IOException {
return generateFromReader(Files.newBufferedReader(file.toPath(), Charset.forName("UTF-8")));
return generateFromReader(Files.newBufferedReader(file.toPath(), Charset.forName(charset)));
}

public TreeContext generateFromStream(InputStream stream) throws IOException {
return generateFromReader(new InputStreamReader(stream, "UTF-8"));
return generateFromReader(new InputStreamReader(stream, charset));
}

public TreeContext generateFromString(String content) throws IOException {
return generateFromReader(new StringReader(content));
}

public TreeGenerator setCharset(String charset) {
this.charset = charset;
return this;
}
}