Fix problem in Java 1.5 with "class" property of java.lang.Object.
diff --git a/plugins/org.eclipse.jem/overrides/java/lang/Object.override b/plugins/org.eclipse.jem/overrides/java/lang/Object.override index cb47ced..a5892fa 100644 --- a/plugins/org.eclipse.jem/overrides/java/lang/Object.override +++ b/plugins/org.eclipse.jem/overrides/java/lang/Object.override
@@ -1,5 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<change:ChangeDescription xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:change="http://www.eclipse.org/emf/2003/Change" xmi:version="2.0"> +<change:ChangeDescription xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.jem.internal.beaninfo.beaninfo="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:change="http://www.eclipse.org/emf/2003/Change" xmi:version="2.0"> + <objectChanges key="X:ROOT#//@root"> + <value featureName="eStructuralFeatures"> + <listChanges referenceValues="_eStructuralFeatures"/> + </value> + </objectChanges> + <!-- Turn class property to a hidden and not introspected property. This is because we don't handle Java 1.5 templates + yet as valid JavaClasses and it causes XMI serialization errors because it includes the "<" in the serialization of the class name + for the standard java class which is: "java:/java.lang#Class<? extends Class>". this is invalid in the serialization. --> + + <objectsToAttach name="class" xmi:id="_eStructuralFeatures" xsi:type="ecore:EReference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"> + <eAnnotations hidden="true" mergeIntrospection="false" xsi:type="org.eclipse.jem.internal.beaninfo.beaninfo:PropertyDecorator"/> + </objectsToAttach> + <!-- This is kind of cheat, but datatypes are never introspected, so we can't get these attributes added to them in a normal way. By doing it here, when java.lang.Object is introspected, these