Attachment #269293 for bug #518909

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 16-21 Link Here

(-)a/org.eclipse.ui.console/src/org/eclipse/ui/console/IOConsoleOutputStream.java (-1 / +8 lines)
16	import java.nio.charset.Charset;	16	import java.nio.charset.Charset;
17		17
18	import org.eclipse.swt.graphics.Color;	18	import org.eclipse.swt.graphics.Color;
		19	import org.eclipse.ui.WorkbenchEncoding;
19	import org.eclipse.ui.internal.console.IOConsolePartitioner;	20	import org.eclipse.ui.internal.console.IOConsolePartitioner;
20	import org.eclipse.ui.internal.console.StreamDecoder;	21	import org.eclipse.ui.internal.console.StreamDecoder;
21		22
Lines 311-317 Link Here
311	* @param encoding encoding identifier	312	* @param encoding encoding identifier
312	*/	313	*/
313	public void setEncoding(String encoding) {	314	public void setEncoding(String encoding) {
314	Charset charset = Charset.forName(encoding);	315	String charsetName;
		316	if (encoding == null) {
		317	charsetName = WorkbenchEncoding.getWorkbenchDefaultEncoding();
		318	} else {
		319	charsetName = encoding;
		320	}
		321	Charset charset = Charset.forName(charsetName);
315	try {	322	try {
316	this.setCharset(charset);	323	this.setCharset(charset);
317	} catch (IOException ioe) {	324	} catch (IOException ioe) {

Return to bug 518909