Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2015-12-02 15:56:54 +0000
committerChristian W. Damus2015-12-02 15:56:54 +0000
commit7ad069e62ccc32d6425008bc1c9960c681653350 (patch)
treef78c39274de71a1f99e8c488a880697c0814813e /extraplugins
parent5a40eb9e3eed2c2de59f2bdeb46fa78b2c79fd3e (diff)
downloadorg.eclipse.papyrus-7ad069e62ccc32d6425008bc1c9960c681653350.tar.gz
org.eclipse.papyrus-7ad069e62ccc32d6425008bc1c9960c681653350.tar.xz
org.eclipse.papyrus-7ad069e62ccc32d6425008bc1c9960c681653350.zip
Bug 466520: [CDO] Replace Model Repositories view with new CDO Checkouts UI
https://bugs.eclipse.org/bugs/show_bug.cgi?id=466520 Revert change that uses a CDO Checkout API that doesn't exist and never did (at least, not in the CDO git repository).
Diffstat (limited to 'extraplugins')
-rw-r--r--extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
index 6eb22e11248..e7fa96f3fac 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/internal/core/resource/CDOSashModelProvider.java
@@ -12,14 +12,11 @@
package org.eclipse.papyrus.cdo.internal.core.resource;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;
import org.eclipse.emf.cdo.util.CDOURIUtil;
-import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.common.util.URI;
import org.eclipse.papyrus.cdo.internal.core.Activator;
-import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.resource.sasheditor.AbstractSashModelProvider;
import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
@@ -52,7 +49,7 @@ public class CDOSashModelProvider extends AbstractSashModelProvider {
}
public CDOSashModelProvider initialize(CDOCheckout checkout) {
- indexFolder = new Path(checkout.getStateFolder("sashidx").toString());
+ indexFolder = SASH_MODEL_STORAGE_ROOT.append(checkout.getView().getSession().getRepositoryInfo().getUUID());
return this;
}

Back to the top