summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-24 02:22:47 (EDT)
committerEike Stepper2007-09-24 02:22:47 (EDT)
commitbd6328c83df6bd443a7695058ecba7bbd287c99f (patch)
tree39927e0daddc0235e7882a2054a259e57cb6afdf
parent75c95028d091e43d50b364ef12b2b22f8e00d288 (diff)
downloadcdo-bd6328c83df6bd443a7695058ecba7bbd287c99f.zip
cdo-bd6328c83df6bd443a7695058ecba7bbd287c99f.tar.gz
cdo-bd6328c83df6bd443a7695058ecba7bbd287c99f.tar.bz2
[202418] Provide CDO builds
https://bugs.eclipse.org/bugs/show_bug.cgi?id=202418
-rw-r--r--plugins/org.eclipse.emf.cdo/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java55
3 files changed, 32 insertions, 32 deletions
diff --git a/plugins/org.eclipse.emf.cdo/build.properties b/plugins/org.eclipse.emf.cdo/build.properties
index c27a13c..3075da2 100644
--- a/plugins/org.eclipse.emf.cdo/build.properties
+++ b/plugins/org.eclipse.emf.cdo/build.properties
@@ -23,3 +23,4 @@ bin.includes = .,\
jars.compile.order = .
source.. = src/
output.. = bin/
+javacFailOnError = false
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
index 19f6752..497543d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.internal.cdo;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.CDOCallback;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.util.FSMUtil;
@@ -22,7 +23,7 @@ import java.util.List;
/**
* @author Eike Stepper
*/
-public class CDOCallbackImpl extends CDOAdapterImpl // implements CDOCallback
+public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback
{
public CDOCallbackImpl(InternalEObject instance)
{
@@ -39,11 +40,6 @@ public class CDOCallbackImpl extends CDOAdapterImpl // implements CDOCallback
CDOStateMachine.INSTANCE.write(this);
}
- // public Resource callbackResource(BasicEObjectImpl instance)
- // {
- // return cdoResource();
- // }
-
@Override
public void notifyChanged(Notification msg)
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index 3493f89..44eb106 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -20,12 +20,15 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EGenericType;
import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.CDOAware;
import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.internal.cdo.CDOAdapterImpl;
+import org.eclipse.emf.internal.cdo.CDOCallbackImpl;
import org.eclipse.emf.internal.cdo.CDOMetaImpl;
import org.eclipse.emf.internal.cdo.CDOViewImpl;
import org.eclipse.emf.internal.cdo.InternalCDOObject;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import java.util.Collection;
import java.util.Iterator;
@@ -82,32 +85,32 @@ public final class FSMUtil
}
}
- // try
- // {
- // if (object instanceof CDOAware)
- // {
- // CDOAware aware = (CDOAware)object;
- // CDOCallbackImpl callback = (CDOCallbackImpl)aware.getCDOCallback();
- // if (callback == null)
- // {
- // InternalEObject instance = (InternalEObject)aware;
- // if (instance.eIsProxy())
- // {
- // instance = (InternalEObject)EcoreUtil.resolve(instance, view.getResourceSet());
- // }
- //
- // callback = new CDOCallbackImpl(instance);
- // aware.setCDOCallback(callback);
- // instance.eAdapters().add(callback);
- // }
- //
- // return callback;
- // }
- // }
- // catch (Throwable t)
- // {
- // OM.LOG.info(t);
- // }
+ try
+ {
+ if (object instanceof CDOAware)
+ {
+ CDOAware aware = (CDOAware)object;
+ CDOCallbackImpl callback = (CDOCallbackImpl)aware.getCDOCallback();
+ if (callback == null)
+ {
+ InternalEObject instance = (InternalEObject)aware;
+ if (instance.eIsProxy())
+ {
+ instance = (InternalEObject)EcoreUtil.resolve(instance, view.getResourceSet());
+ }
+
+ callback = new CDOCallbackImpl(instance);
+ aware.setCDOCallback(callback);
+ instance.eAdapters().add(callback);
+ }
+
+ return callback;
+ }
+ }
+ catch (Throwable t)
+ {
+ OM.LOG.info(t);
+ }
if (object instanceof InternalEObject)
{