Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2013-10-11 03:07:44 -0400
committerGerrit Code Review @ Eclipse.org2013-10-18 05:54:14 -0400
commit1eb0c8efe5a3709f013e179a13fb221f207738f3 (patch)
tree8e0b28ebc075e535d30732294f167327c1c2be93 /plugins/org.eclipse.emf.compare.ide.ui/src
parent8ecb357104a1c73d47a32e9e9ddc26c30150720b (diff)
downloadorg.eclipse.emf.compare-1eb0c8efe5a3709f013e179a13fb221f207738f3.tar.gz
org.eclipse.emf.compare-1eb0c8efe5a3709f013e179a13fb221f207738f3.tar.xz
org.eclipse.emf.compare-1eb0c8efe5a3709f013e179a13fb221f207738f3.zip
Comparison fails when files have spaces in their names
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ProjectModelResolver.java2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/StreamAccessorStorage.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ProjectModelResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ProjectModelResolver.java
index 3582a4a60..f66d4f1ed 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ProjectModelResolver.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ProjectModelResolver.java
@@ -450,7 +450,7 @@ public class ProjectModelResolver extends LogicalModelResolver {
segments = segments.subList(1, segments.size());
}
for (String segment : segments) {
- path.append(segment).append('/');
+ path.append(URI.decode(segment)).append('/');
}
return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(path.toString()));
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/StreamAccessorStorage.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/StreamAccessorStorage.java
index db610319f..c2b7b4a65 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/StreamAccessorStorage.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/StreamAccessorStorage.java
@@ -120,7 +120,7 @@ public class StreamAccessorStorage implements IStorage {
if (revision != null) {
final URI uri = revision.getURI();
if (uri != null) {
- tmp = uri.toString();
+ tmp = org.eclipse.emf.common.util.URI.decode(uri.toString());
} else if (revision instanceof IAdaptable) {
final IResourceVariant variant = (IResourceVariant)((IAdaptable)revision)
.getAdapter(IResourceVariant.class);

Back to the top