From 9d7a1580251e76e5bb83c788e1d8feb76f1448ff Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Tue, 10 Jun 2008 00:49:48 +0000
Subject: [PATCH] [227571] RSE Terminal should honor Encoding set on the IHost

---
 .../terminals/ui/views/TerminalViewTab.java   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewTab.java b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewTab.java
index dbafe9f6fa4..69d8b7be9d5 100644
--- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewTab.java
+++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewTab.java
@@ -19,6 +19,8 @@
  ********************************************************************************/
 package org.eclipse.rse.internal.terminals.ui.views;
 
+import java.io.UnsupportedEncodingException;
+
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -191,13 +193,12 @@ public class TerminalViewTab extends Composite implements ITerminalListener{
             ITerminalViewControl terminalControl = TerminalViewControlFactory
                     .makeControl(this, c,
                             new ITerminalConnector[] { connector });
-            // TODO https://bugs.eclipse.org/bugs/show_bug.cgi?id=204796
 			// Specify Encoding for Terminal
-			// try {
-			// terminalControl.setEncoding(host.getDefaultEncoding(true));
-			// } catch (UnsupportedEncodingException e) {
-			// /* ignore and allow fallback to default encoding */
-			// }
+			try {
+				terminalControl.setEncoding(host.getDefaultEncoding(true));
+			} catch (UnsupportedEncodingException e) {
+				/* ignore and allow fallback to default encoding */
+			}
             terminalControl.setConnector(connector);
             terminalControl.connectTerminal();
             if (initialWorkingDirCmd != null) {
@@ -312,7 +313,7 @@ public class TerminalViewTab extends Composite implements ITerminalListener{
                     return;
                 }
             }
-            
+
             titem.setImage(va.getImageDescriptor(root).createImage());
         }
     }
@@ -325,18 +326,18 @@ public class TerminalViewTab extends Composite implements ITerminalListener{
                         Object data = item.getData();
                         if (data instanceof IHost){
                             IHost host = (IHost)data;
-                            final ITerminalServiceSubSystem terminalServiceSubSystem = TerminalServiceHelper.getTerminalSubSystem(host);         
+                            final ITerminalServiceSubSystem terminalServiceSubSystem = TerminalServiceHelper.getTerminalSubSystem(host);
 
                             if (state == TerminalState.CONNECTED)
                                 TerminalServiceHelper.updateTerminalShellForTerminalElement(item);
-                            
+
                             setTabImage(host, item);
                             ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
                             registry.fireEvent(new SystemResourceChangeEvent(terminalServiceSubSystem,
                                     ISystemResourceChangeEvents.EVENT_REFRESH, terminalServiceSubSystem));
                         }
                     }
-                }                   
+                }
             });
         }