Bug 191379

Console encoding does not match workspace encoding

3 files changed, 10 insertions, 14 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index fd07ef3b5..c6c3c0354 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -25,7 +25,7 @@ CommonTab_13=Select a Resource:
 CommonTab_14=Select a resource to redirect output to:
 CommonTab_0=Save as
 CommonTab_1=Console Encoding
-CommonTab_2=Defa&ult ({0})
+CommonTab_2=Workspace Defa&ult ({0})
 CommonTab_3=Oth&er
 CommonTab_4=Standard Input and Output
 CommonTab_5=&Allocate Console (necessary for input)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java
index 87deadee9..d7c438552 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractLaunchConfigurationTab.java
@@ -223,13 +223,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura
 	 * @since 3.0
 	 */
 	protected Button createCheckButton(Composite parent, String label) {
-		Button button = new Button(parent, SWT.CHECK);
-		button.setText(label);
-		GridData data = new GridData();
-		button.setLayoutData(data);
-		button.setFont(parent.getFont());
-		SWTFactory.setButtonDimensionHint(button);
-		return button;
+		return SWTFactory.createCheckButton(parent, label, null, false, 1);
 	}
 	
 	/**
@@ -252,11 +246,7 @@ public abstract class AbstractLaunchConfigurationTab implements ILaunchConfigura
 	 * @param colSpan the number of line of vertical space to add
 	 */
 	protected void createVerticalSpacer(Composite comp, int colSpan) {
-		Label label = new Label(comp, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		label.setLayoutData(gd);
-		label.setFont(comp.getFont());
+		SWTFactory.createVerticalSpacer(comp, colSpan);
 	}	
 	
 	/**
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
index c3d911dae..ee4566d0f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
@@ -334,7 +334,10 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
      */
     private void createEncodingComponent(Composite parent) {
 	    List allEncodings = IDEEncoding.getIDEEncodings();
-	    String defaultEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
+	    String defaultEncoding = IDEEncoding.getResourceEncoding();
+	    if(defaultEncoding == null) {
+	    	defaultEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
+	    }
 	    Group group = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.CommonTab_1, 2, 1, GridData.FILL_BOTH);
 	    
 	    fDefaultEncodingButton = createRadioButton(group, MessageFormat.format(LaunchConfigurationsMessages.CommonTab_2, new String[]{defaultEncoding})); 
@@ -758,6 +761,9 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
 		if(fAltEncodingButton.getSelection()) {
 		    encoding = fEncodingCombo.getText();
 		}
+		else {
+			encoding = IDEEncoding.getResourceEncoding();
+		}
 		configuration.setAttribute(DebugPlugin.ATTR_CONSOLE_ENCODING, encoding);
 		boolean captureOutput = false;
 		if (fConsoleOutput.getSelection()) {