Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-03-01 08:24:09 +0000
committerEike Stepper2011-03-01 08:24:09 +0000
commit36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f (patch)
tree79903d98261a5ec3474781d59d08f6b8ca28107f /plugins/org.eclipse.emf.cdo.common/src
parentd811c1d1af82a8c87fadcb144835a9c31b5c029f (diff)
downloadcdo-36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f.tar.gz
cdo-36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f.tar.xz
cdo-36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f.zip
[338508] CDOResource.contents should not resolve proxies
https://bugs.eclipse.org/bugs/show_bug.cgi?id=338508
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
index 5bbbcca65f..7bb81eb0c9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOModelUtil.java
@@ -67,7 +67,7 @@ public final class CDOModelUtil
/**
* @since 2.0
*/
- public static final String RESOURCE_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Eresource/2.0.0"; //$NON-NLS-1$
+ public static final String RESOURCE_PACKAGE_URI = "http://www.eclipse.org/emf/CDO/Eresource/4.0.0"; //$NON-NLS-1$
/**
* @since 2.0
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index fda7fee9af..fef294c7bb 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -222,7 +222,7 @@ public final class EMFUtil
return true;
}
}
-
+
return false;
}

Back to the top