[474377] The cached field CDOResourceImpl.uri needs to be recomputed after moves

https://bugs.eclipse.org/bugs/show_bug.cgi?id=474377

1 files changed, 7 insertions, 6 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
index 90d59b16c2..b086a009ef 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
@@ -48,6 +48,8 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.spi.cdo.InternalCDOObject;
 import org.eclipse.emf.spi.cdo.InternalCDOView;
 
+import org.eclipse.core.runtime.Path;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -684,16 +686,15 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec
 
   public URI createResourceURI(String path)
   {
+    String authority = getID();
+
     if (StringUtil.isEmpty(path))
     {
-      path = "";
-    }
-    else if (!path.startsWith("/"))
-    {
-      path = "/" + path;
+      return URI.createHierarchicalURI(CDOCheckoutViewProvider.SCHEME, authority, null, null, null, null);
     }
 
-    return URI.createURI(CDOCheckoutViewProvider.SCHEME + "://" + getID() + path);
+    String[] segments = new Path(path).segments();
+    return URI.createHierarchicalURI(CDOCheckoutViewProvider.SCHEME, authority, null, segments, null, null);
   }
 
   public String getEditorOpenerID(CDOID objectID)