[467138] Let CDOResourceNode.getURI() return the normalized URI

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

1 files changed, 19 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java
index 54371a1bf3..5970240c1f 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java
@@ -12,8 +12,10 @@ package org.eclipse.emf.cdo.internal.explorer.checkouts;
 
 import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
 import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;
+import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.AbstractCDOViewProvider;
 import org.eclipse.emf.cdo.view.CDOView;
+import org.eclipse.emf.cdo.view.CDOViewSet;
 
 import org.eclipse.net4j.util.lifecycle.ILifecycle;
 import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
@@ -135,7 +137,23 @@ public class CDOCheckoutViewProvider extends AbstractCDOViewProvider
         if (view == null)
         {
           ResourceSet resourceSet = getTarget();
-          view = checkout.openView(resourceSet);
+          CDOViewSet viewSet = CDOUtil.getViewSet(resourceSet);
+          if (viewSet != null)
+          {
+            for (CDOView viewSetView : viewSet.getViews())
+            {
+              if (checkout == CDOExplorerUtil.getCheckout(viewSetView))
+              {
+                view = viewSetView;
+                break;
+              }
+            }
+          }
+
+          if (view == null)
+          {
+            view = checkout.openView(resourceSet);
+          }
 
           if (view != null)
           {