diff options
author | Eike Stepper | 2015-05-20 10:20:05 +0000 |
---|---|---|
committer | Eike Stepper | 2015-05-20 10:33:56 +0000 |
commit | 26f3832ce0f83af27ebfc763d24b526c02b207e6 (patch) | |
tree | d81806e5c849224e7248dd12b23adf63a6126136 /plugins/org.eclipse.emf.cdo.explorer/src | |
parent | e5a4f78c481f623858f6cb4ca9d6c3890ab7025a (diff) | |
download | cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.tar.gz cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.tar.xz cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.zip |
[467442] Add Interactive Transaction Conflict Resolution
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467442
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer/src')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java | 6 |
1 files changed, 0 insertions, 6 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 44b71d0cf4..20c921f693 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 @@ -98,12 +98,6 @@ public class CDOCheckoutViewProvider extends AbstractCDOViewProvider return new Path(uri.path()).makeAbsolute().removeFirstSegments(1).toString(); } - @Override - public URI getViewURI(URI uri) - { - return URI.createHierarchicalURI(uri.scheme(), uri.authority(), null, uri.query(), null); - } - public static void disposeResourceSet(ResourceSet resourceSet) { CheckoutViewProviderAdapter adapter = CheckoutViewProviderAdapter.get(resourceSet); |