summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-08 13:06:27 (EDT)
committerEike Stepper2007-08-08 13:06:27 (EDT)
commitbc24521e18b474cb947aa249f67bc8d1b6c6fbbb (patch)
tree75a4059cca59bb5ef815d7d8b8ac7def244ce739
parent0aa99b45bace7167736d8f03909a7b9417478d5f (diff)
downloadcdo-bc24521e18b474cb947aa249f67bc8d1b6c6fbbb.zip
cdo-bc24521e18b474cb947aa249f67bc8d1b6c6fbbb.tar.gz
cdo-bc24521e18b474cb947aa249f67bc8d1b6c6fbbb.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java12
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java8
5 files changed, 15 insertions, 18 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
index 04acc42..ed18052 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.impl.EClassifierImpl;
import org.eclipse.emf.ecore.impl.EPackageImpl;
@@ -172,10 +173,17 @@ public final class EMFUtil
List<EStructuralFeature> result = new ArrayList();
for (EStructuralFeature feature : eFeatues)
{
- if (!feature.isTransient())
+ if (feature.isTransient())
{
- result.add(feature);
+ continue;
}
+
+ if (feature == EcorePackage.eINSTANCE.getEClass_ESuperTypes())
+ {
+ continue;
+ }
+
+ result.add(feature);
}
return result;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
index 47b8138..a15fd00 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
@@ -390,11 +390,6 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
protected Object getInstanceValue(InternalEObject instance, CDOFeatureImpl feature)
{
EStructuralFeature eFeature = ModelUtil.getEFeature(feature, cdoView().getSession().getPackageRegistry());
- // if (eFeature.isUnsettable() &&!instance.eIsSet(eFeature))
- // {
- // return eFeature.getDefaultValue();
- // }
-
return instance.eGet(eFeature);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java
index 0a299f3..71d337e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java
@@ -113,7 +113,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements CDOP
public EPackage getEPackage()
{
- EPackage ePackage = ModelUtil.createEPackage(cdoPackage, CDOPackageRegistryImpl.this);
+ EPackage ePackage = ModelUtil.createEPackage(cdoPackage);
session.registerEPackage(ePackage, cdoPackage.getMetaIDRange());
return ePackage;
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
index 8b83034..e18bd45 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
@@ -425,12 +425,6 @@ public final class CDOStore implements EStore
}
CDOStateMachine.INSTANCE.attach(contained, container.cdoResource(), containerView);
-
- // if (contained instanceof CDOLegacyImpl && container instanceof
- // Resource.Internal)
- // {
- // ((CDOLegacyImpl)contained).transferResourceToInstance((Resource.Internal)container);
- // }
}
}
}
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 448324a..245de48 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
@@ -198,7 +198,7 @@ public final class ModelUtil
ePackage = packageRegistry.getEPackage(uri);
if (ePackage == null)
{
- ePackage = createEPackage(cdoPackage, packageRegistry);
+ ePackage = createEPackage(cdoPackage);
packageRegistry.put(uri, ePackage);
}
@@ -234,11 +234,11 @@ public final class ModelUtil
return eFeature;
}
- public static EPackage createEPackage(CDOPackageImpl cdoPackage, CDOPackageRegistryImpl packageRegistry)
+ public static EPackage createEPackage(CDOPackageImpl cdoPackage)
{
if (!cdoPackage.isDynamic())
{
- EPackage ePackage = createGeneratedEPackage(cdoPackage.getPackageURI(), packageRegistry);
+ EPackage ePackage = createGeneratedEPackage(cdoPackage.getPackageURI());
if (ePackage != null)
{
return ePackage;
@@ -248,7 +248,7 @@ public final class ModelUtil
return createDynamicEPackage(cdoPackage);
}
- public static EPackage createGeneratedEPackage(String packageURI, CDOPackageRegistryImpl packageRegistry)
+ public static EPackage createGeneratedEPackage(String packageURI)
{
if (packageURI.equals(EcorePackage.eINSTANCE.getNsURI()))
{