[167669] EMF upgrade issues
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
index 18f8d84..1de7966 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
@@ -10,6 +10,7 @@
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
public class RootTranslator extends Translator {
@@ -28,7 +29,7 @@
* @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(Notifier, Object, int)
*/
public void setMOFValue(Notifier owner, Object value, int newIndex) {
- ((Resource) owner).getContents().add(newIndex, value);
+ ((Resource) owner).getContents().add(newIndex, (EObject)value);
}
/**
@@ -46,7 +47,7 @@
*/
public void setMOFValue(Resource res, Object value) {
if (res != null && value != null)
- res.getContents().add(value);
+ res.getContents().add((EObject)value);
}
/*
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
index 685181c..812b4d0 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
@@ -628,7 +628,7 @@
*/
public void setMOFValue(Resource res, Object value) {
if (res != null && value != null)
- res.getContents().add(value);
+ res.getContents().add((EObject)value);
}
public void removeMOFValue(Notifier owner, Object value) {
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java
index b243775..d996003 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java
@@ -14,11 +14,13 @@
*/
package org.eclipse.wst.common.internal.emf.utilities;
+import org.eclipse.emf.common.notify.Adapter;
+
/**
* Interface that exposes the clone method, for objects that need to generically copy other
* cloneable objects
*/
-public interface CloneablePublic extends Cloneable {
+public interface CloneablePublic extends Cloneable, Adapter.Internal {
Object clone();
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/PassthruResourceSet.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/PassthruResourceSet.java
index 863e0dd..71b536f 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/PassthruResourceSet.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/PassthruResourceSet.java
@@ -47,7 +47,7 @@
return false;
ResourceSet set = WorkbenchResourceHelperBase.getResourceSet(((Resource) object).getURI());
if (set != null)
- return set.getResources().add(object);
+ return set.getResources().add((Resource)object);
return super.add(object);
}
