From 3309644d96575eaa5757db48ceac7560ca4c2e6b Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Sat, 7 Oct 2006 22:47:24 +0000 Subject: [PATCH] Switch to UTF-8 encoding in order to fix nightly builds on Linux with u-accent character --- .../.settings/org.eclipse.core.resources.prefs | 3 +++ .../src/org/eclipse/rse/services/files/ftp/FTPHostFile.java | 2 +- .../src/org/eclipse/rse/services/files/ftp/FTPService.java | 6 +++--- .../.settings/org.eclipse.core.resources.prefs | 3 +++ .../internal/services/local/shells/LocalShellThread.java | 2 +- .../.settings/org.eclipse.core.resources.prefs | 3 +++ rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml | 2 +- .../files/ftp/connectorservice/FTPConnectorService.java | 2 +- .../.settings/org.eclipse.core.resources.prefs | 3 +++ .../org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java | 2 +- 10 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 rse/plugins/org.eclipse.rse.services.files.ftp/.settings/org.eclipse.core.resources.prefs create mode 100644 rse/plugins/org.eclipse.rse.services.local/.settings/org.eclipse.core.resources.prefs create mode 100644 rse/plugins/org.eclipse.rse.subsystems.files.ftp/.settings/org.eclipse.core.resources.prefs create mode 100644 rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.core.resources.prefs diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.services.files.ftp/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..b6e2f767cfc --- /dev/null +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sun Oct 08 00:09:13 CEST 2006 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPHostFile.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPHostFile.java index 8235ed9952d..aca401c44f3 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPHostFile.java +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPHostFile.java @@ -12,7 +12,7 @@ * * Contributors: * Michael Berger (IBM) - Fixing 140408 - FTP upload does not work - * Javier Montalvo Orus (Symbian) - Migrate to jakarta commons net FTP client + * Javier Montalvo Orús (Symbian) - Migrate to jakarta commons net FTP client ********************************************************************************/ package org.eclipse.rse.services.files.ftp; diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java index 18c1b4aaa40..5b154dc4078 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java @@ -12,11 +12,11 @@ * * Contributors: * Michael Berger (IBM) - Fixing 140408 - FTP upload does not work - * Javier Montalvo Orus (Symbian) - Fixing 140323 - provided implementation for + * Javier Montalvo Orús (Symbian) - Fixing 140323 - provided implementation for * delete, move and rename. - * Javier Montalvo Orus (Symbian) - Bug 140348 - FTP did not use port number + * Javier Montalvo Orús (Symbian) - Bug 140348 - FTP did not use port number * Michael Berger (IBM) - Fixing 140404 - FTP new file creation does not work - * Javier Montalvo Orus (Symbian) - Migrate to jakarta commons net FTP client + * Javier Montalvo Orús (Symbian) - Migrate to jakarta commons net FTP client ********************************************************************************/ package org.eclipse.rse.services.files.ftp; diff --git a/rse/plugins/org.eclipse.rse.services.local/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.services.local/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..b6e2f767cfc --- /dev/null +++ b/rse/plugins/org.eclipse.rse.services.local/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sun Oct 08 00:09:13 CEST 2006 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellThread.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellThread.java index 6280fb76602..1cdfff2f53c 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellThread.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellThread.java @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * Javier Montalvo Orus (Symbian) - 138619: Fix codepage on Win2K + * Javier Montalvo Orús (Symbian) - 138619: Fix codepage on Win2K ********************************************************************************/ package org.eclipse.rse.internal.services.local.shells; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..b6e2f767cfc --- /dev/null +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sun Oct 08 00:09:13 CEST 2006 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml index 8e054867f74..ce85bf04a09 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml @@ -12,7 +12,7 @@ Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. Contributors: -Javier Montalvo Orus (Symbian) - add Windows to list of valid FTP systems +Javier Montalvo Orús (Symbian) - add Windows to list of valid FTP systems --> diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java index 2e51a71bd79..5c7d16f2bac 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * Javier Montalvo Orus (Symbian) - Bug 140348 - FTP did not use port number + * Javier Montalvo Orús (Symbian) - Bug 140348 - FTP did not use port number ********************************************************************************/ package org.eclipse.rse.subsystems.files.ftp.connectorservice; diff --git a/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..0ada1787f86 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Sun Oct 08 00:45:23 CEST 2006 +eclipse.preferences.version=1 +encoding//UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java=UTF-8 diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java index 9096d7ae57a..c57a4680e17 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * Javier Montalvo Orus (Symbian) - Bug 158555 - newConnectionWizardDelegates can only be used once + * Javier Montalvo Orús (Symbian) - Bug 158555 - newConnectionWizardDelegates can only be used once ********************************************************************************/ package org.eclipse.rse.ui.wizards;