Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-07-21 03:43:35 -0400
committerUwe Stieber2014-07-21 03:43:35 -0400
commit98cd236aa12962c763f4a4c636a377e174cb2a62 (patch)
treea22c7c05504c0a795d3cd2c4e994acaa8fcd284f
parentec1c4b2813475dba9d9434b859b1e63706f5984d (diff)
downloadorg.eclipse.tcf-98cd236aa12962c763f4a4c636a377e174cb2a62.tar.gz
org.eclipse.tcf-98cd236aa12962c763f4a4c636a377e174cb2a62.tar.xz
org.eclipse.tcf-98cd236aa12962c763f4a4c636a377e174cb2a62.zip
Target Explorer: Bug 436001 - [TERMINALS] The default encoding must be
UTF-8 on Windows, and should be remembered per connection if changed
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.feature/feature.xml3
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml7
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF3
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java5
5 files changed, 12 insertions, 10 deletions
diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
index 295348faf..8bf872e07 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
@@ -54,10 +54,10 @@
<import plugin="com.google.gson" version="2.2.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.variables" version="3.2.600" match="greaterOrEqual"/>
<import plugin="org.eclipse.help" version="3.6.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.terminals" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.tcf.te.ui.terminals.process" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.security" version="1.1.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.tm.terminal" version="3.2.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.serial" version="2.1.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/>
@@ -66,6 +66,7 @@
<import feature="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/>
<import feature="org.eclipse.cdt.platform" version="8.3.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.ide" version="3.10.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml
index a98f9ba68..258954746 100644
--- a/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.terminals.feature/feature.xml
@@ -24,12 +24,6 @@
<update label="%updateSiteName" url="http://download.eclipse.org/releases/kepler"/>
</url>
- <!-- For PTY.Modes.TERMINAL , we need minimum o.e.cdt.core_5.6 which is in CDT 8.3 -->
- <!-- But we express this in bundle dependencies only in order to get a smaller install -->
- <!-- The side-effect of depending on feature o.e.cdt.native is that it requires CDT 8.4 -->
- <!-- This is OK for this "stand-alone" feature. Product builders who want CDT 8.3 can -->
- <!-- Still get it by not using this feature but direct cdt.platform / bundle dependency -->
- <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=435150 -->
<requires>
<import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
@@ -53,6 +47,7 @@
<import feature="org.eclipse.tm.terminal.serial" version="2.1.300" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.terminal.ssh" version="2.1.300" match="greaterOrEqual"/>
<import feature="org.eclipse.tm.terminal.telnet" version="2.1.300" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui.ide" version="3.10.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java
index 0ad8d2ba8..a4f83dcfb 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/controls/LocalWizardConfigurationPanel.java
@@ -61,8 +61,8 @@ public class LocalWizardConfigurationPanel extends AbstractConfigurationPanel im
createEncodingUI(panel, false);
// Set the default encoding:
- // Default UTF-8 on Mac for Local, Preferences:Platform encoding otherwise
- if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+ // Default UTF-8 on Mac or Windows for Local, Preferences:Platform encoding otherwise
+ if (Platform.OS_MACOSX.equals(Platform.getOS()) || Platform.OS_WIN32.equals(Platform.getOS())) {
setEncoding("UTF-8"); //$NON-NLS-1$
} else {
String encoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF
index 72ccd7cf6..70c42e9b4 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0",
org.eclipse.tm.terminal;bundle-version="3.2.300",
org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.forms;bundle-version="3.5.200"
+ org.eclipse.ui.forms;bundle-version="3.5.200",
+ org.eclipse.ui.ide;bundle-version="3.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java
index 2e6a8eb6d..be515d53a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/panels/AbstractConfigurationPanel.java
@@ -48,6 +48,7 @@ import org.eclipse.tcf.te.ui.terminals.interfaces.IConfigurationPanel;
import org.eclipse.tcf.te.ui.terminals.nls.Messages;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.WorkbenchEncoding;
+import org.eclipse.ui.ide.IDEEncoding;
/**
* Abstract terminal configuration panel implementation.
@@ -487,6 +488,10 @@ public abstract class AbstractConfigurationPanel extends AbstractWizardConfigura
encodings.add("Default (ISO-8859-1)"); //$NON-NLS-1$
encodings.add("UTF-8"); //$NON-NLS-1$
+ // The currently selected IDE encoding from the preferences
+ String ideEncoding = IDEEncoding.getResourceEncoding();
+ if (ideEncoding != null && !encodings.contains(ideEncoding)) encodings.add(ideEncoding);
+
// The default Eclipse Workbench encoding (configured in the preferences)
String eclipseEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
if (eclipseEncoding != null && !encodings.contains(eclipseEncoding)) encodings.add(eclipseEncoding);

Back to the top