Attachment 185328 Details for Bug 332745 – backport patch

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

[patch] backport patch

patch.txt (text/plain), 2.09 KB, created by David McKnight

on 2010-12-16 10:12:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2010-12-16 10:12:30 EST

Size: 2.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java,v
>retrieving revision 1.13
>diff -u -r1.13 SystemConnectionPropertyPage.java
>--- UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java	7 Nov 2008 21:55:00 -0000	1.13
>+++ UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java	16 Dec 2010 15:12:10 -0000
>@@ -1,5 +1,5 @@
> /********************************************************************************
>- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
>+ * Copyright (c) 2002, 2010 IBM Corporation and others. All rights reserved.
>  * This program and the accompanying materials are made available under the terms
>  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
>  * available at http://www.eclipse.org/legal/epl-v10.html
>@@ -18,6 +18,7 @@
>  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
>  * David McKnight   (IBM)        - [226574] don't show encoding if no subsystem supports it
>  * David McKnight   (IBM)        - [252708] Saving Profile Job happens when not changing Property Values on Connections
>+ * Noriaki Takatsu  (IBM)        - [332393] Default encoding is removed in System Connection property page
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.ui.propertypages;
>@@ -145,7 +146,7 @@
> 			  conn.setDefaultEncoding(encoding, false);
> 		  }
> 		  // remote default encoding
>-		  else if (currentEncoding != null){
>+		  else if (currentEncoding != null && !encoding.equals(currentEncoding)){
> 			  // remove user encoding from host property first
> 			  conn.setDefaultEncoding(null, false);
> 			  // remove default remote encoding to indicate to get from remote system

Actions: View | Diff

Attachments on bug 332745: 185328