diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo')
3 files changed, 12 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java index c2961e93d9..97a04e35f8 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java @@ -43,7 +43,7 @@ public class CDORevisionInstantiator implements Instantiator public Object instantiate(Serializable id) { - return CDORevisionUtil.create(eClass, CDOIDHibernateFactoryImpl.getInstance().createCDOID(id, eClass.getName())); + return CDORevisionUtil.createRevision(eClass, CDOIDHibernateFactoryImpl.getInstance().createCDOID(id, eClass.getName())); } public boolean isInstance(Object object) diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java index b0772fea7a..23f4f5a901 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Martin Taal - changed handling of propertygetters/setters @@ -225,10 +225,12 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer EStructuralFeature feature = getEClass().getEStructuralFeature(mappedProperty.getName()); if (feature instanceof EReference && feature.isMany()) { + // TODO Clarify feature maps return new CDOManyReferenceGetter(this, mappedProperty.getName()); } else if (feature instanceof EReference) { + // TODO Clarify feature maps return new CDOReferenceGetter(this, mappedProperty.getName()); } @@ -283,11 +285,13 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer EStructuralFeature feature = getEClass().getEStructuralFeature(mappedProperty.getName()); if (feature instanceof EReference && feature.isMany()) { + // TODO Clarify feature maps return new CDOManyReferenceSetter(this, mappedProperty.getName()); } if (feature instanceof EReference) { + // TODO Clarify feature maps return new CDOReferenceSetter(this, mappedProperty.getName()); } diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java index 252a9675b8..e044d9bab7 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WrappedHibernateList.java @@ -20,8 +20,8 @@ import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil; import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.emf.ecore.EStructuralFeature; import java.util.ArrayList; import java.util.Collection; @@ -90,9 +90,12 @@ public class WrappedHibernateList implements InternalCDOList } } - public void adjustReferences(CDOReferenceAdjuster adjuster, EClass classifier) + /** + * There's a duplicate of this method in CDOListImpl!!! + */ + public void adjustReferences(CDOReferenceAdjuster adjuster, EStructuralFeature feature) { - CDOType type = CDOModelUtil.getType(classifier); + CDOType type = CDOModelUtil.getType(feature); int size = size(); for (int i = 0; i < size; i++) { |