diff options
author | Simon McDuff | 2008-10-20 22:47:22 +0000 |
---|---|---|
committer | Simon McDuff | 2008-10-20 22:47:22 +0000 |
commit | daab78adc0c67763ccfc09c9a538d1c013d82078 (patch) | |
tree | 65dfa9dc2ccb364efcc8cd098266f6f4c1774888 /plugins/org.eclipse.emf.cdo/src/org | |
parent | fd3beba89ffe3920ee09daef4465795075e16ead (diff) | |
download | cdo-daab78adc0c67763ccfc09c9a538d1c013d82078.tar.gz cdo-daab78adc0c67763ccfc09c9a538d1c013d82078.tar.xz cdo-daab78adc0c67763ccfc09c9a538d1c013d82078.zip |
[251461] CDOResource with root=true returns eResource()==null
https://bugs.eclipse.org/bugs/show_bug.cgi?id=251461
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org')
4 files changed, 26 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java index a3b2e63ce4..41737a508a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java @@ -153,6 +153,22 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, } /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @since 2.0 + */ + @Override + public Resource.Internal eDirectResource() + { + if (isRoot()) + { + return this; + } + return super.eDirectResource(); + } + + /** * @since 2.0 */ public boolean isRoot() diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java index f53383a84f..4dee625f88 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CDOResourceNodeImpl.java,v 1.2 2008-10-19 01:28:53 smcduff Exp $ + * $Id: CDOResourceNodeImpl.java,v 1.3 2008-10-20 22:47:22 smcduff Exp $ */ package org.eclipse.emf.cdo.eresource.impl; @@ -178,13 +178,17 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe */ public String getPath() { + if (isRoot()) + { + return CDOResourceNode.ROOT_PATH; + } + CDOResourceFolder folder = getFolder(); if (folder == null) { - return "/" + getName(); + return CDOResourceNode.ROOT_PATH + getName(); } - - return folder.getPath() + "/" + getName(); + return folder.getPath() + CDOResourceNode.ROOT_PATH + getName(); } /** diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java index a6e8153c60..08fe0f1a45 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java @@ -20,10 +20,10 @@ import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; -import org.eclipse.emf.cdo.util.EMFUtil; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.CDOPackageType; import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry; +import org.eclipse.emf.cdo.util.EMFUtil; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.bundle.OM; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java index 44c5b02dd3..e883e078a4 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java @@ -29,8 +29,8 @@ import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.cdo.spi.common.InternalCDOClass; import org.eclipse.emf.cdo.spi.common.InternalCDOFeature; import org.eclipse.emf.cdo.spi.common.InternalCDOPackage; -import org.eclipse.emf.cdo.util.EMFUtil; import org.eclipse.emf.cdo.util.CDOPackageRegistry; +import org.eclipse.emf.cdo.util.EMFUtil; import org.eclipse.emf.internal.cdo.CDOFactoryImpl; import org.eclipse.emf.internal.cdo.CDOSessionImpl; |