From b8c9ed86bcd70de71072eb6d76d308fd8b8abc75 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 20 Dec 2006 19:01:11 +0000 Subject: [PATCH] Fix [168586] LocalFileService.isCaseSensitive() is false on Windows --- rse/features/org.eclipse.rse.local-feature/feature.xml | 2 +- .../org.eclipse.rse.services.local/META-INF/MANIFEST.MF | 2 +- .../eclipse/rse/services/local/files/LocalFileService.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml index c71a579385a..6c2dee91cf1 100644 --- a/rse/features/org.eclipse.rse.local-feature/feature.xml +++ b/rse/features/org.eclipse.rse.local-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF index d2c52dd68bb..ea0458ad674 100644 --- a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.services.local;singleton:=true -Bundle-Version: 1.0.1.qualifier +Bundle-Version: 1.0.2.qualifier Bundle-Activator: org.eclipse.rse.services.local.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java index 327536a0d2d..29e13c7b760 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/services/local/files/LocalFileService.java @@ -12,6 +12,7 @@ * * Contributors: * Javier Montalvo Orús (Symbian) - patch for bug 163103 - NPE in filters + * Martin Oberhuber (Wind River) - fix 168586 - isCaseSensitive() on Windows ********************************************************************************/ package org.eclipse.rse.services.local.files; @@ -1190,7 +1191,9 @@ public class LocalFileService extends AbstractFileService implements IFileServic * @param sourceFolderOrFile The file or folder to copy * @param targetFolder The folder to copy to. No guarantee it is on the same system, so be sure to check getSystemConnection()! * @param newName The new name for the copied file or folder - * @param encoding The encoding for the file once it is extracted from the archive + * @param sourceEncoding encoding of source file + * @param targetEncoding desired encoding of target file + * @param isText currently unused * @return true iff the copy succeeded */ public boolean copyFromArchive(File sourceFolderOrFile, File targetFolder, String newName, IProgressMonitor monitor, String sourceEncoding, String targetEncoding, boolean isText) throws SystemMessageException @@ -1294,7 +1297,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic public boolean isCaseSensitive() { - return true; + return !isWindows(); } public boolean copyBatch(IProgressMonitor monitor, String[] srcParents, String[] srcNames, String tgtParent) throws SystemMessageException