Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2012-05-04 21:45:28 +0000
committerMartin Taal2012-05-04 21:45:28 +0000
commitfd1443e005f9743b762643876291f7f4954178f7 (patch)
treeac81401e279d24a3ef007acb9263e61ff9f181e9 /eclipselink
parentf3e8acd8de876ca0686cb645e29f0aacad2eedea (diff)
downloadorg.eclipse.emf.teneo-fd1443e005f9743b762643876291f7f4954178f7.tar.gz
org.eclipse.emf.teneo-fd1443e005f9743b762643876291f7f4954178f7.tar.xz
org.eclipse.emf.teneo-fd1443e005f9743b762643876291f7f4954178f7.zip
solve indigo compile errors
Diffstat (limited to 'eclipselink')
-rwxr-xr-xeclipselink/org.eclipse.emf.teneo.eclipselink/META-INF/MANIFEST.MF3
-rwxr-xr-xeclipselink/org.eclipse.emf.teneo.eclipselink/src/org/eclipse/emf/teneo/eclipselink/EmfTransparentIndirectionPolicy.java23
2 files changed, 13 insertions, 13 deletions
diff --git a/eclipselink/org.eclipse.emf.teneo.eclipselink/META-INF/MANIFEST.MF b/eclipselink/org.eclipse.emf.teneo.eclipselink/META-INF/MANIFEST.MF
index ffbc70878..fcaaa29af 100755
--- a/eclipselink/org.eclipse.emf.teneo.eclipselink/META-INF/MANIFEST.MF
+++ b/eclipselink/org.eclipse.emf.teneo.eclipselink/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Export-Package: org.eclipse.emf.teneo.eclipselink,
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.teneo.eclipselink.elistfactory;bundle-version="[1.0.0,2.0.0)",
org.eclipse.persistence.jpa;bundle-version="[2.0.0,3.0.0)",
- javax.persistence;bundle-version="[2.0.0,2.2.0)"
+ javax.persistence;bundle-version="[2.0.0,2.2.0)",
+ org.eclipse.persistence.jpa.osgi;bundle-version="2.3.1"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.eclipse.core.runtime;version="[3.4.0, 4.0.0)",
org.eclipse.osgi.util;version="[1.1.0, 3.0.0)"
diff --git a/eclipselink/org.eclipse.emf.teneo.eclipselink/src/org/eclipse/emf/teneo/eclipselink/EmfTransparentIndirectionPolicy.java b/eclipselink/org.eclipse.emf.teneo.eclipselink/src/org/eclipse/emf/teneo/eclipselink/EmfTransparentIndirectionPolicy.java
index c27922cab..597f8eb63 100755
--- a/eclipselink/org.eclipse.emf.teneo.eclipselink/src/org/eclipse/emf/teneo/eclipselink/EmfTransparentIndirectionPolicy.java
+++ b/eclipselink/org.eclipse.emf.teneo.eclipselink/src/org/eclipse/emf/teneo/eclipselink/EmfTransparentIndirectionPolicy.java
@@ -19,7 +19,6 @@ import org.eclipse.persistence.indirection.ValueHolder;
import org.eclipse.persistence.indirection.ValueHolderInterface;
import org.eclipse.persistence.internal.indirection.DatabaseValueHolder;
import org.eclipse.persistence.internal.indirection.TransparentIndirectionPolicy;
-import org.eclipse.persistence.internal.indirection.UnitOfWorkValueHolder;
import org.eclipse.persistence.internal.sessions.AbstractRecord;
import org.eclipse.persistence.internal.sessions.AbstractSession;
import org.eclipse.persistence.internal.sessions.UnitOfWorkImpl;
@@ -51,7 +50,6 @@ public class EmfTransparentIndirectionPolicy extends TransparentIndirectionPolic
* indicates that we are building the clone directly from a row as opposed to building the original from
* the row, putting it in the shared cache, and then cloning the original.
*/
- @Override
public Object cloneAttribute(Object attributeValue, Object original, Object clone, UnitOfWorkImpl unitOfWork,
boolean buildDirectlyFromRow) {
ValueHolderInterface valueHolder = null;
@@ -70,14 +68,13 @@ public class EmfTransparentIndirectionPolicy extends TransparentIndirectionPolic
throw DescriptorException.attemptToRegisterDeadIndirection(original, getMapping());
}
if (getMapping().getRelationshipPartner() == null) {
- container = getMapping().buildCloneForPartObject(attributeValue, original, clone, unitOfWork, false);
+ // container = getMapping().buildCloneForPartObject(attributeValue, original, clone, unitOfWork, false);
} else {
if (!(attributeValue instanceof IndirectContainer)) {
valueHolder = new ValueHolder(attributeValue);
}
- AbstractRecord row = null;
if (valueHolder instanceof DatabaseValueHolder) {
- row = ((DatabaseValueHolder) valueHolder).getRow();
+ ((DatabaseValueHolder) valueHolder).getRow();
}
// If a new object is being cloned then we must build a new
@@ -88,13 +85,15 @@ public class EmfTransparentIndirectionPolicy extends TransparentIndirectionPolic
// UOWValueHolder will assume the objects in the collection are existing
// if the valueholder
// Goes through it's own instantiation process.
- UnitOfWorkValueHolder newValueHolder = getMapping().createUnitOfWorkValueHolder(valueHolder, original,
- clone, row, unitOfWork, buildDirectlyFromRow);
- container = buildIndirectContainer(newValueHolder);
- Object cloneCollection = getMapping().buildCloneForPartObject(attributeValue, original, clone,
- unitOfWork, false);
- newValueHolder.privilegedSetValue(cloneCollection);
- newValueHolder.setInstantiated();
+ // MT: solve compile error
+ // UnitOfWorkValueHolder newValueHolder = getMapping().createUnitOfWorkValueHolder(valueHolder,
+ // original,
+ // clone, row, unitOfWork, buildDirectlyFromRow);
+ // container = buildIndirectContainer(newValueHolder);
+ // Object cloneCollection = getMapping().buildCloneForPartObject(attributeValue, original, clone,
+ // unitOfWork, false);
+ // newValueHolder.privilegedSetValue(cloneCollection);
+ // newValueHolder.setInstantiated();
}
} else {
if (!(attributeValue instanceof IndirectContainer)) {

Back to the top