diff options
Diffstat (limited to 'plugins/org.eclipse.jem')
74 files changed, 1390 insertions, 1199 deletions
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java index 77fc80105..22467ff0f 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation; *******************************************************************************/ /* * $RCSfile: ImplicitAllocation.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; @@ -25,6 +25,10 @@ import org.eclipse.emf.ecore.EStructuralFeature; * @since 1.0.0 * <!-- end-user-doc --> * + * <!-- begin-model-doc --> + * This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm. + * <!-- end-model-doc --> + * * <p> * The following features are supported: * <ul> @@ -37,7 +41,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; * @model * @generated */ -public interface ImplicitAllocation extends JavaAllocation { +public interface ImplicitAllocation extends JavaAllocation{ /** * Returns the value of the '<em><b>Parent</b></em>' reference. * <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java index 1afc241e6..b697ed9ea 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation; *******************************************************************************/ /* * $RCSfile: InitStringAllocation.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ /** @@ -40,6 +40,9 @@ public interface InitStringAllocation extends JavaAllocation{ * there really should be more of a description here... * </p> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * This is the initialization string for this object. + * <!-- end-model-doc --> * @return the value of the '<em>Init String</em>' attribute. * @see #setInitString(String) * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getInitStringAllocation_InitString() diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java index c3b06246d..3aab1373a 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation; *******************************************************************************/ /* * $RCSfile: InstantiationPackage.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EAttribute; @@ -31,6 +31,9 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * Java Instantiation Package + * <!-- end-model-doc --> * @see org.eclipse.jem.internal.instantiation.InstantiationFactory * @generated */ diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java index 52fedfd47..3e53dea35 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation; *******************************************************************************/ /* * $RCSfile: JavaAllocation.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EObject; @@ -25,6 +25,10 @@ import org.eclipse.emf.ecore.EObject; * @since 1.0.0 * <!-- end-user-doc --> * + * <!-- begin-model-doc --> + * This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized. + * <!-- end-model-doc --> + * * <p> * The following features are supported: * <ul> @@ -44,6 +48,9 @@ public interface JavaAllocation extends EObject{ * This is the allocation string in readable format. It is usually a comment string to make viewing the XMI easier. It is typically not used otherwise. A specific subclass may use it, and that subclass will indicate that it does. * </p> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * This is the allocation string in readable format. It is derived in that subclasses will need to implement the getComputedAllocationString method to return the actual string. This string will be used directly in the code generation so it must be accurate. The set method is there, but it is ignored. This is just so that the string shows up in XMI serialization. (I.e. it is really read-only, but XMI doesn't understand this on serialization). + * <!-- end-model-doc --> * @return the value of the '<em>Alloc String</em>' attribute. * @see #setAllocString(String) * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getJavaAllocation_AllocString() diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java index 858589630..ac2f7d339 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java @@ -11,13 +11,13 @@ package org.eclipse.jem.internal.instantiation.base; *******************************************************************************/ /* * $RCSfile: JavaDataTypeInstance.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.jem.internal.instantiation.JavaAllocation; -import org.eclipse.jem.internal.java.JavaHelpers; +import org.eclipse.jem.java.JavaHelpers; /** * This is the default instance of a Java Model Datatype (i.e. primitive). diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java index d12914ca5..89f516894 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java @@ -11,13 +11,13 @@ package org.eclipse.jem.internal.instantiation.base; *******************************************************************************/ /* * $RCSfile: JavaFactoryHandler.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.*; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaDataType; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaDataType; import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler; /** @@ -35,7 +35,7 @@ public class JavaFactoryHandler implements IInstantiationHandler { } /* (non-Javadoc) - * @see org.eclipse.jem.internal.java.instantiation.IInstantiationHandler#handlesClass(org.eclipse.emf.ecore.EClass) + * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#handlesClass(org.eclipse.emf.ecore.EClass) */ public boolean handlesClass(EClass type) { return type instanceof JavaClass || type instanceof JavaDataType; @@ -43,14 +43,14 @@ public class JavaFactoryHandler implements IInstantiationHandler { } /* (non-Javadoc) - * @see org.eclipse.jem.internal.java.instantiation.IInstantiationHandler#handlesDataType(org.eclipse.jem.internal.java.JavaDataType) + * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#handlesDataType(org.eclipse.jem.java.JavaDataType) */ public boolean handlesDataType(JavaDataType type) { return true; } /* (non-Javadoc) - * @see org.eclipse.jem.internal.java.instantiation.IInstantiationHandler#create(org.eclipse.emf.ecore.EClass) + * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#create(org.eclipse.emf.ecore.EClass) */ public EObject create(EClass javaClass) { EObject result = javaClass instanceof JavaClass ? (EObject) new JavaObjectInstance() : new JavaDataTypeInstance(); diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java index ba448eff6..872e367ec 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.base; *******************************************************************************/ /* * $RCSfile: JavaInstantiation.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.util.URI; @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jem.internal.java.JavaClass; +import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter; /** diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java index 21336f93c..9d14fd498 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java @@ -11,12 +11,12 @@ package org.eclipse.jem.internal.instantiation.base; *******************************************************************************/ /* * $RCSfile: JavaInstantiationHandlerFactoryAdapter.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.impl.AdapterImpl; -import org.eclipse.jem.internal.java.impl.JavaFactoryImpl; +import org.eclipse.jem.java.impl.JavaFactoryImpl; import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler; import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter; diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java index 5a2f3f9a5..f1164f582 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.base; *******************************************************************************/ /* * $RCSfile: JavaObjectInstance.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.util.BasicEList; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.jem.internal.instantiation.JavaAllocation; -import org.eclipse.jem.internal.java.JavaHelpers; +import org.eclipse.jem.java.JavaHelpers; /** * This is the default instance for java model objects. diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java index c4840ccc4..a75a995eb 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.impl; *******************************************************************************/ /* * $RCSfile: ImplicitAllocationImpl.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.Notification; @@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jem.internal.instantiation.ImplicitAllocation; import org.eclipse.jem.internal.instantiation.InstantiationPackage; @@ -67,8 +67,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - protected ImplicitAllocationImpl() - { + protected ImplicitAllocationImpl() { super(); } @@ -77,8 +76,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return InstantiationPackage.eINSTANCE.getImplicitAllocation(); } @@ -87,11 +85,10 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public EObject getParent() - { + public EObject getParent() { if (parent != null && parent.eIsProxy()) { EObject oldParent = parent; - parent = (EObject)EcoreUtil.resolve(parent, this); + parent = (EObject)eResolveProxy((InternalEObject)parent); if (parent != oldParent) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.IMPLICIT_ALLOCATION__PARENT, oldParent, parent)); @@ -105,8 +102,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public EObject basicGetParent() - { + public EObject basicGetParent() { return parent; } @@ -115,8 +111,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public void setParent(EObject newParent) - { + public void setParent(EObject newParent) { EObject oldParent = parent; parent = newParent; if (eNotificationRequired()) @@ -128,11 +123,10 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public EStructuralFeature getFeature() - { + public EStructuralFeature getFeature() { if (feature != null && feature.eIsProxy()) { EStructuralFeature oldFeature = feature; - feature = (EStructuralFeature)EcoreUtil.resolve(feature, this); + feature = (EStructuralFeature)eResolveProxy((InternalEObject)feature); if (feature != oldFeature) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE, oldFeature, feature)); @@ -146,8 +140,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public EStructuralFeature basicGetFeature() - { + public EStructuralFeature basicGetFeature() { return feature; } @@ -156,8 +149,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public void setFeature(EStructuralFeature newFeature) - { + public void setFeature(EStructuralFeature newFeature) { EStructuralFeature oldFeature = feature; feature = newFeature; if (eNotificationRequired()) @@ -169,8 +161,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public Object eGet(EStructuralFeature eFeature, boolean resolve) - { + public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.IMPLICIT_ALLOCATION__ALLOC_STRING: return getAllocString(); @@ -189,8 +180,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public void eSet(EStructuralFeature eFeature, Object newValue) - { + public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.IMPLICIT_ALLOCATION__ALLOC_STRING: setAllocString((String)newValue); @@ -210,8 +200,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public void eUnset(EStructuralFeature eFeature) - { + public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.IMPLICIT_ALLOCATION__ALLOC_STRING: setAllocString((String)null); @@ -231,8 +220,7 @@ public class ImplicitAllocationImpl extends JavaAllocationImpl implements Implic * <!-- end-user-doc --> * @generated */ - public boolean eIsSet(EStructuralFeature eFeature) - { + public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.IMPLICIT_ALLOCATION__ALLOC_STRING: return getAllocString() != null; diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java index e4cd14db6..e95b5fba0 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.impl; *******************************************************************************/ /* * $RCSfile: InitStringAllocationImpl.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.Notification; @@ -63,8 +63,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - protected InitStringAllocationImpl() - { + protected InitStringAllocationImpl() { super(); } @@ -73,8 +72,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return InstantiationPackage.eINSTANCE.getInitStringAllocation(); } @@ -83,8 +81,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - public String getInitString() - { + public String getInitString() { return initString; } @@ -93,8 +90,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - public void setInitString(String newInitString) - { + public void setInitString(String newInitString) { String oldInitString = initString; initString = newInitString; if (eNotificationRequired()) @@ -106,8 +102,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - public Object eGet(EStructuralFeature eFeature, boolean resolve) - { + public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.INIT_STRING_ALLOCATION__ALLOC_STRING: return getAllocString(); @@ -122,8 +117,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - public void eSet(EStructuralFeature eFeature, Object newValue) - { + public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.INIT_STRING_ALLOCATION__ALLOC_STRING: setAllocString((String)newValue); @@ -140,8 +134,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - public void eUnset(EStructuralFeature eFeature) - { + public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.INIT_STRING_ALLOCATION__ALLOC_STRING: setAllocString((String)null); @@ -158,8 +151,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - public boolean eIsSet(EStructuralFeature eFeature) - { + public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.INIT_STRING_ALLOCATION__ALLOC_STRING: return getAllocString() != null; @@ -174,8 +166,7 @@ public class InitStringAllocationImpl extends JavaAllocationImpl implements Init * <!-- end-user-doc --> * @generated */ - public String toString() - { + public String toString() { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java index 34cf719ea..2c7c5ebc4 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.impl; *******************************************************************************/ /* * $RCSfile: InstantiationFactoryImpl.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.jem.internal.instantiation.*; @@ -34,8 +34,7 @@ public class InstantiationFactoryImpl extends EFactoryImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public InstantiationFactoryImpl() - { + public InstantiationFactoryImpl() { super(); } @@ -44,8 +43,7 @@ public class InstantiationFactoryImpl extends EFactoryImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EObject create(EClass eClass) - { + public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { case InstantiationPackage.INIT_STRING_ALLOCATION: return createInitStringAllocation(); case InstantiationPackage.IMPLICIT_ALLOCATION: return createImplicitAllocation(); @@ -59,8 +57,7 @@ public class InstantiationFactoryImpl extends EFactoryImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public InitStringAllocation createInitStringAllocation() - { + public InitStringAllocation createInitStringAllocation() { InitStringAllocationImpl initStringAllocation = new InitStringAllocationImpl(); return initStringAllocation; } @@ -70,8 +67,7 @@ public class InstantiationFactoryImpl extends EFactoryImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public ImplicitAllocation createImplicitAllocation() - { + public ImplicitAllocation createImplicitAllocation() { ImplicitAllocationImpl implicitAllocation = new ImplicitAllocationImpl(); return implicitAllocation; } @@ -81,21 +77,19 @@ public class InstantiationFactoryImpl extends EFactoryImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public InstantiationPackage getInstantiationPackage() - { + public InstantiationPackage getInstantiationPackage() { return (InstantiationPackage)getEPackage(); } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @deprecated * @generated */ - public static InstantiationPackage getPackage() - { + public static InstantiationPackage getPackage() { return InstantiationPackage.eINSTANCE; } - /* (non-Javadoc) * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createImplicitAllocation(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature) */ diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java index 5d5dd9d97..da47a331b 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.impl; *******************************************************************************/ /* * $RCSfile: InstantiationPackageImpl.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EAttribute; @@ -98,8 +98,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * @see #init() * @generated */ - private InstantiationPackageImpl() - { + private InstantiationPackageImpl() { super(eNS_URI, InstantiationFactory.eINSTANCE); } @@ -132,8 +131,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * @see #initializePackageContents() * @generated */ - public static InstantiationPackage init() - { + public static InstantiationPackage init() { if (isInited) return (InstantiationPackage)EPackage.Registry.INSTANCE.get(InstantiationPackage.eNS_URI); // Obtain or create and register package. @@ -160,8 +158,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EClass getIJavaObjectInstance() - { + public EClass getIJavaObjectInstance() { return iJavaObjectInstanceEClass; } @@ -170,8 +167,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EClass getJavaAllocation() - { + public EClass getJavaAllocation() { return javaAllocationEClass; } @@ -180,9 +176,8 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EAttribute getJavaAllocation_AllocString() - { - return (EAttribute)javaAllocationEClass.getEAttributes().get(0); + public EAttribute getJavaAllocation_AllocString() { + return (EAttribute)javaAllocationEClass.getEStructuralFeatures().get(0); } /** @@ -190,8 +185,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EClass getInitStringAllocation() - { + public EClass getInitStringAllocation() { return initStringAllocationEClass; } @@ -200,9 +194,8 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EAttribute getInitStringAllocation_InitString() - { - return (EAttribute)initStringAllocationEClass.getEAttributes().get(0); + public EAttribute getInitStringAllocation_InitString() { + return (EAttribute)initStringAllocationEClass.getEStructuralFeatures().get(0); } /** @@ -210,8 +203,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EClass getImplicitAllocation() - { + public EClass getImplicitAllocation() { return implicitAllocationEClass; } @@ -220,9 +212,8 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EReference getImplicitAllocation_Parent() - { - return (EReference)implicitAllocationEClass.getEReferences().get(0); + public EReference getImplicitAllocation_Parent() { + return (EReference)implicitAllocationEClass.getEStructuralFeatures().get(0); } /** @@ -230,9 +221,8 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EReference getImplicitAllocation_Feature() - { - return (EReference)implicitAllocationEClass.getEReferences().get(1); + public EReference getImplicitAllocation_Feature() { + return (EReference)implicitAllocationEClass.getEStructuralFeatures().get(1); } /** @@ -240,8 +230,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EClass getIJavaDataTypeInstance() - { + public EClass getIJavaDataTypeInstance() { return iJavaDataTypeInstanceEClass; } @@ -250,8 +239,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public EClass getIJavaInstance() - { + public EClass getIJavaInstance() { return iJavaInstanceEClass; } @@ -260,8 +248,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public InstantiationFactory getInstantiationFactory() - { + public InstantiationFactory getInstantiationFactory() { return (InstantiationFactory)getEFactoryInstance(); } @@ -279,8 +266,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public void createPackageContents() - { + public void createPackageContents() { if (isCreated) return; isCreated = true; @@ -316,8 +302,7 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat * <!-- end-user-doc --> * @generated */ - public void initializePackageContents() - { + public void initializePackageContents() { if (isInitialized) return; isInitialized = true; @@ -343,14 +328,14 @@ public class InstantiationPackageImpl extends EPackageImpl implements Instantiat initEClass(iJavaObjectInstanceEClass, IJavaObjectInstance.class, "IJavaObjectInstance", IS_ABSTRACT, IS_INTERFACE); initEClass(javaAllocationEClass, JavaAllocation.class, "JavaAllocation", IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getJavaAllocation_AllocString(), ecorePackage.getEString(), "allocString", null, 0, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); + initEAttribute(getJavaAllocation_AllocString(), ecorePackage.getEString(), "allocString", null, 0, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); initEClass(initStringAllocationEClass, InitStringAllocation.class, "InitStringAllocation", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getInitStringAllocation_InitString(), ecorePackage.getEString(), "initString", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); + initEAttribute(getInitStringAllocation_InitString(), ecorePackage.getEString(), "initString", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); initEClass(implicitAllocationEClass, ImplicitAllocation.class, "ImplicitAllocation", !IS_ABSTRACT, !IS_INTERFACE); - initEReference(getImplicitAllocation_Parent(), theEcorePackage.getEObject(), null, "parent", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getImplicitAllocation_Feature(), theEcorePackage.getEStructuralFeature(), null, "feature", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEReference(getImplicitAllocation_Parent(), theEcorePackage.getEObject(), null, "parent", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getImplicitAllocation_Feature(), theEcorePackage.getEStructuralFeature(), null, "feature", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); // Create resource createResource(eNS_URI); diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java index 95f438753..accdc1eec 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.impl; *******************************************************************************/ /* * $RCSfile: JavaAllocationImpl.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ @@ -42,8 +42,7 @@ public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllo * <!-- end-user-doc --> * @generated */ - protected JavaAllocationImpl() - { + protected JavaAllocationImpl() { super(); } @@ -52,8 +51,7 @@ public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllo * <!-- end-user-doc --> * @generated */ - protected EClass eStaticClass() - { + protected EClass eStaticClass() { return InstantiationPackage.eINSTANCE.getJavaAllocation(); } @@ -88,8 +86,7 @@ public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllo * <!-- end-user-doc --> * @generated */ - public Object eGet(EStructuralFeature eFeature, boolean resolve) - { + public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.JAVA_ALLOCATION__ALLOC_STRING: return getAllocString(); @@ -102,8 +99,7 @@ public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllo * <!-- end-user-doc --> * @generated */ - public void eSet(EStructuralFeature eFeature, Object newValue) - { + public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.JAVA_ALLOCATION__ALLOC_STRING: setAllocString((String)newValue); @@ -117,8 +113,7 @@ public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllo * <!-- end-user-doc --> * @generated */ - public void eUnset(EStructuralFeature eFeature) - { + public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.JAVA_ALLOCATION__ALLOC_STRING: setAllocString((String)null); @@ -132,8 +127,7 @@ public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllo * <!-- end-user-doc --> * @generated */ - public boolean eIsSet(EStructuralFeature eFeature) - { + public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { case InstantiationPackage.JAVA_ALLOCATION__ALLOC_STRING: return getAllocString() != null; diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationAdapterFactory.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationAdapterFactory.java index 6ecef0ee8..fc0deb0c4 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationAdapterFactory.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationAdapterFactory.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.util; *******************************************************************************/ /* * $RCSfile: InstantiationAdapterFactory.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.Adapter; @@ -50,8 +50,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * <!-- end-user-doc --> * @generated */ - public InstantiationAdapterFactory() - { + public InstantiationAdapterFactory() { if (modelPackage == null) { modelPackage = InstantiationPackage.eINSTANCE; } @@ -65,8 +64,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @return whether this factory is applicable for the type of the object. * @generated */ - public boolean isFactoryForType(Object object) - { + public boolean isFactoryForType(Object object) { if (object == modelPackage) { return true; } @@ -115,8 +113,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @return the adapter for the <code>target</code>. * @generated */ - public Adapter createAdapter(Notifier target) - { + public Adapter createAdapter(Notifier target) { return (Adapter)modelSwitch.doSwitch((EObject)target); } @@ -131,8 +128,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @see org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance * @generated */ - public Adapter createIJavaDataTypeInstanceAdapter() - { + public Adapter createIJavaDataTypeInstanceAdapter() { return null; } @@ -146,8 +142,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @see org.eclipse.jem.internal.instantiation.base.IJavaInstance * @generated */ - public Adapter createIJavaInstanceAdapter() - { + public Adapter createIJavaInstanceAdapter() { return null; } @@ -161,8 +156,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @see org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance * @generated */ - public Adapter createIJavaObjectInstanceAdapter() - { + public Adapter createIJavaObjectInstanceAdapter() { return null; } @@ -176,8 +170,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @see org.eclipse.jem.internal.instantiation.JavaAllocation * @generated */ - public Adapter createJavaAllocationAdapter() - { + public Adapter createJavaAllocationAdapter() { return null; } @@ -191,8 +184,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @see org.eclipse.jem.internal.instantiation.InitStringAllocation * @generated */ - public Adapter createInitStringAllocationAdapter() - { + public Adapter createInitStringAllocationAdapter() { return null; } @@ -206,8 +198,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @see org.eclipse.jem.internal.instantiation.ImplicitAllocation * @generated */ - public Adapter createImplicitAllocationAdapter() - { + public Adapter createImplicitAllocationAdapter() { return null; } @@ -219,8 +210,7 @@ public class InstantiationAdapterFactory extends AdapterFactoryImpl { * @return the new adapter. * @generated */ - public Adapter createEObjectAdapter() - { + public Adapter createEObjectAdapter() { return null; } diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationSwitch.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationSwitch.java index 8846395f6..1dad583d4 100644 --- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationSwitch.java +++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/util/InstantiationSwitch.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.instantiation.util; *******************************************************************************/ /* * $RCSfile: InstantiationSwitch.java,v $ - * $Revision: 1.1 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EClass; @@ -51,8 +51,7 @@ public class InstantiationSwitch { * <!-- end-user-doc --> * @generated */ - public InstantiationSwitch() - { + public InstantiationSwitch() { if (modelPackage == null) { modelPackage = InstantiationPackage.eINSTANCE; } @@ -65,8 +64,7 @@ public class InstantiationSwitch { * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ - public Object doSwitch(EObject theEObject) - { + public Object doSwitch(EObject theEObject) { EClass theEClass = theEObject.eClass(); if (theEClass.eContainer() == modelPackage) { switch (theEClass.getClassifierID()) { @@ -101,8 +99,7 @@ public class InstantiationSwitch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public Object caseIJavaDataTypeInstance(IJavaDataTypeInstance object) - { + public Object caseIJavaDataTypeInstance(IJavaDataTypeInstance object) { return null; } @@ -117,8 +114,7 @@ public class InstantiationSwitch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public Object caseIJavaInstance(IJavaInstance object) - { + public Object caseIJavaInstance(IJavaInstance object) { return null; } @@ -133,8 +129,7 @@ public class InstantiationSwitch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public Object caseIJavaObjectInstance(IJavaObjectInstance object) - { + public Object caseIJavaObjectInstance(IJavaObjectInstance object) { return null; } @@ -149,8 +144,7 @@ public class InstantiationSwitch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public Object caseJavaAllocation(JavaAllocation object) - { + public Object caseJavaAllocation(JavaAllocation object) { return null; } @@ -165,8 +159,7 @@ public class InstantiationSwitch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public Object caseInitStringAllocation(InitStringAllocation object) - { + public Object caseInitStringAllocation(InitStringAllocation object) { return null; } @@ -181,8 +174,7 @@ public class InstantiationSwitch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public Object caseImplicitAllocation(ImplicitAllocation object) - { + public Object caseImplicitAllocation(ImplicitAllocation object) { return null; } @@ -197,8 +189,7 @@ public class InstantiationSwitch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ - public Object defaultCase(EObject object) - { + public Object defaultCase(EObject object) { return null; } diff --git a/plugins/org.eclipse.jem/model/instance.ecore b/plugins/org.eclipse.jem/model/instance.ecore index d4aa8d7d3..c7c0f8422 100644 --- a/plugins/org.eclipse.jem/model/instance.ecore +++ b/plugins/org.eclipse.jem/model/instance.ecore @@ -1,24 +1,49 @@ <?xml version="1.0" encoding="ASCII"?> -<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="instantiation" +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="instantiation" nsURI="http:///org/eclipse/jem/internal/instantiation.ecore" nsPrefix="org.eclipse.jem.internal.instantiation"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Java Instantiation Package"/> + </eAnnotations> <eClassifiers xsi:type="ecore:EClass" name="IJavaDataTypeInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance" abstract="true" interface="true" eSuperTypes="#//IJavaInstance"/> <eClassifiers xsi:type="ecore:EClass" name="IJavaInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaInstance" abstract="true" interface="true"/> <eClassifiers xsi:type="ecore:EClass" name="IJavaObjectInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance" - abstract="true" interface="true" eSuperTypes="#//IJavaInstance"/> + abstract="true" interface="true" eSuperTypes="#//IJavaInstance"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This interface is the instance of an java object in the java model."/> + </eAnnotations> + </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="JavaAllocation" abstract="true"> - <eAttributes name="allocString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - volatile="true"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized."/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="allocString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" + volatile="true"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This is the allocation string in readable format. It is derived in that subclasses will need to implement the getComputedAllocationString method to return the actual string. This string will be used directly in the code generation so it must be accurate. The set method is there, but it is ignored. This is just so that the string shows up in XMI serialization. (I.e. it is really read-only, but XMI doesn't understand this on serialization)."/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="InitStringAllocation" eSuperTypes="#//JavaAllocation"> - <eAttributes name="initString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This is used when the allocation string can be parsed by the remote vm. It uses the allocString."/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="initString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This is the initialization string for this object."/> + </eAnnotations> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ImplicitAllocation" eSuperTypes="#//JavaAllocation"> - <eReferences name="parent" eType="ecore:EClass ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EObject" - lowerBound="1"/> - <eReferences name="feature" eType="ecore:EClass ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EStructuralFeature" - lowerBound="1"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm."/> + </eAnnotations> + <eStructuralFeatures xsi:type="ecore:EReference" name="parent" lowerBound="1" + eType="ecore:EClass ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EObject"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1" + eType="ecore:EClass ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EStructuralFeature"/> </eClassifiers> </ecore:EPackage> diff --git a/plugins/org.eclipse.jem/model/instance.genmodel b/plugins/org.eclipse.jem/model/instance.genmodel index 35c8ddc0e..539ecf026 100644 --- a/plugins/org.eclipse.jem/model/instance.genmodel +++ b/plugins/org.eclipse.jem/model/instance.genmodel @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> -<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/javainst" +<genmodel:GenModel xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/javainst" editDirectory="/org.eclipse.jem.edit/src" editorDirectory="/org.eclipse.jem.editor/src" modelPluginID="" modelName="instance" editPluginClass="org.eclipse.jem.internal.instantiation.provider.instanceEditPlugin" editorPluginClass="org.eclipse.jem.internal.instantiation.presentation.instanceEditorPlugin" diff --git a/plugins/org.eclipse.jem/model/java.ecore b/plugins/org.eclipse.jem/model/java.ecore index 9f86da1e8..32845076e 100644 --- a/plugins/org.eclipse.jem/model/java.ecore +++ b/plugins/org.eclipse.jem/model/java.ecore @@ -1,169 +1,351 @@ <?xml version="1.0" encoding="ASCII"?> -<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="java" - nsURI="java.xmi" nsPrefix="org.eclipse.jem.internal.java"> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="java" + nsURI="java.xmi" nsPrefix="org.eclipse.jem.java"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Changes to synch up with Java3e:
- deleted JavaElement, BodyElement which didn't add anything useful
- deleted NestedClass and the association which described nesting, contents can be used instead
- deleted extends/extendedBy which is replaced with MOF subtype/supertype
- deleted the clumsy main diagram
- moved the MOF inheritance details to the MOF binding diagram
- deleted "final" on JavaParameter, don't know what that was supposed to be
- deleted the Category junk
- changed the Block-typed attributes on Field, Method, Initializer to be associations to Block

Outstanding questions/issues:
- JavaParameterKind should go away if we get the base Parameter kind fixed up
"/> + </eAnnotations> <eClassifiers xsi:type="ecore:EClass" name="JavaClass" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EClass"> <eOperations name="isNested" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> <eOperations name="getField" eType="#//Field"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return an Field with the passed name, or null."/> + </eAnnotations> <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eOperations> <eOperations name="getFieldExtended" eType="#//Field"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value=" Return an Field with the passed name from this JavaClass or any supertypes.

Return null if a Field named fieldName is not found."/> + </eAnnotations> <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eOperations> <eOperations name="getFieldNamed" eType="#//Field"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return an Field with the passed name, or null."/> + </eAnnotations> <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eOperations> - <eOperations name="getFieldsExtended" eType="#//JTypeList"/> + <eOperations name="getFieldsExtended" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return all fields, including those from supertypes."/> + </eAnnotations> + </eOperations> <eOperations name="getMethod" eType="#//Method"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Get the method of this name and these parameters. It will not look up the supertype hierarchy."/> + </eAnnotations> <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="parameterTypes" eType="#//JTypeList"/> + <eParameters name="parameterTypes" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="List of parameter types."/> + </eAnnotations> + </eParameters> + </eOperations> + <eOperations name="getMethodElementSignatures" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return a List of Strings that represent MethodElement signatures from most general to most specific."/> + </eAnnotations> </eOperations> - <eOperations name="getMethodElementSignatures" eType="#//JTypeList"/> <eOperations name="getMethodExtended" eType="#//Method"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Get the method of this name and these parameters. It will look up the supertype hierarchy."/> + </eAnnotations> <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="parameterTypes" eType="#//JTypeList"/> + <eParameters name="parameterTypes" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="List of parameter types."/> + </eAnnotations> + </eParameters> + </eOperations> + <eOperations name="getMethodsExtended" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return all methods, including those from supertypes."/> + </eAnnotations> </eOperations> - <eOperations name="getMethodsExtended" eType="#//JTypeList"/> <eOperations name="getOnlySpecificMethods" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return a List of Methods that begins with @aMethodNamePrefix and is not included in the @excludedNames list. If @aMethodNamePrefix is null, all methods will be returned.
"/> + </eAnnotations> <eParameters name="aMethodNamePrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eParameters name="excludedNames" eType="#//JTypeList"/> </eOperations> <eOperations name="getPublicMethod" eType="#//Method"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It will not look up the supertype hierarchy."/> + </eAnnotations> <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eParameters name="parameterTypes" eType="#//JTypeList"/> + <eParameters name="parameterTypes" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="List of parameter types."/> + </eAnnotations> + </eParameters> + </eOperations> + <eOperations name="getPublicMethods" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return all methods, it will not go up the supertype hierarchy."/> + </eAnnotations> + </eOperations> + <eOperations name="getPublicMethodsExtended" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return all public methods, including those from supertypes."/> + </eAnnotations> </eOperations> - <eOperations name="getPublicMethods" eType="#//JTypeList"/> - <eOperations name="getPublicMethodsExtended" eType="#//JTypeList"/> <eOperations name="getPublicMethodsNamed" eType="#//JTypeList"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Returns a filtered list on the methods of this class, having a name equal to that of the parameter."/> + </eAnnotations> <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eOperations> <eOperations name="getSupertype" eType="#//JavaClass"/> <eOperations name="implementsInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Test whether the receiver implements the passed interface (or one of its supertypes)."/> + </eAnnotations> <eParameters name="interfaceType" eType="#//JavaClass"/> </eOperations> - <eOperations name="infoString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eOperations name="infoString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return a string showing our details."/> + </eAnnotations> + </eOperations> <eOperations name="inheritsFrom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Tests whether this class inherits from the passed in class."/> + </eAnnotations> <eParameters name="javaClass" eType="#//JavaClass"/> </eOperations> - <eOperations name="isExistingType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eOperations name="isInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eOperations name="isExistingType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Does this type exist."/> + </eAnnotations> + </eOperations> + <eOperations name="isInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Is this an interface."/> + </eAnnotations> + </eOperations> <eOperations name="setSupertype"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Set the supertype."/> + </eAnnotations> <eParameters name="javaclass" eType="#//JavaClass"/> </eOperations> - <eReferences name="implementsInterfaces" eType="#//JavaClass" upperBound="-1"/> - <eReferences name="classImport" eType="#//JavaClass" upperBound="-1"/> - <eReferences name="packageImports" eType="#//JavaPackage" upperBound="-1"/> - <eReferences name="fields" eType="#//Field" upperBound="-1" containment="true" - eOpposite="#//Field/javaClass"/> - <eReferences name="methods" eType="#//Method" upperBound="-1" containment="true" - eOpposite="#//Method/javaClass"/> - <eReferences name="initializers" eType="#//Initializer" upperBound="-1" containment="true" - eOpposite="#//Initializer/javaClass"/> - <eReferences name="declaredClasses" eType="#//JavaClass" upperBound="-1" eOpposite="#//JavaClass/declaringClass"/> - <eReferences name="declaringClass" eType="#//JavaClass" eOpposite="#//JavaClass/declaredClasses"/> - <eReferences name="javaPackage" eType="#//JavaPackage" changeable="false" volatile="true" - transient="true" eOpposite="#//JavaPackage/javaClasses"/> - <eReferences name="events" eType="#//JavaEvent" upperBound="-1" containment="true"/> - <eReferences name="allEvents" eType="#//JavaEvent" volatile="true" transient="true" - upperBound="-1"/> - <eAttributes name="kind" eType="#//TypeKind"/> - <eAttributes name="public" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//TypeKind"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="public" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="implementsInterfaces" upperBound="-1" + eType="#//JavaClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="classImport" upperBound="-1" + eType="#//JavaClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="packageImports" upperBound="-1" + eType="#//JavaPackage"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="fields" upperBound="-1" + eType="#//Field" containment="true" eOpposite="#//Field/javaClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1" + eType="#//Method" containment="true" eOpposite="#//Method/javaClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" upperBound="-1" + eType="#//Initializer" containment="true" eOpposite="#//Initializer/javaClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="declaredClasses" upperBound="-1" + eType="#//JavaClass" eOpposite="#//JavaClass/declaringClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="declaringClass" eType="#//JavaClass" + eOpposite="#//JavaClass/declaredClasses"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaPackage" eType="#//JavaPackage" + changeable="false" volatile="true" transient="true" eOpposite="#//JavaPackage/javaClasses"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1" + eType="#//JavaEvent" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="allEvents" upperBound="-1" + eType="#//JavaEvent" volatile="true" transient="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Initializer"> - <eReferences name="javaClass" eType="#//JavaClass" transient="true" eOpposite="#//JavaClass/initializers"/> - <eReferences name="source" eType="#//Block"/> - <eAttributes name="isStatic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="isStatic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass" + transient="true" eOpposite="#//JavaClass/initializers"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Block"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="JavaParameter" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EParameter ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EModelElement"> - <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eOperations name="isReturn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Is this parameter type an array type."/> + </eAnnotations> + </eOperations> + <eOperations name="isReturn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Is this a return parameter."/> + </eAnnotations> + </eOperations> <eOperations name="getJavaType" eType="#//JTypeJavaHelpers"/> <eOperations name="getQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eAttributes name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="parameterKind" eType="#//JavaParameterKind"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterKind" eType="#//JavaParameterKind"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Method" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EOperation"> - <eOperations name="getContainingJavaClass" eType="#//JavaClass"/> - <eOperations name="getMethodElementSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eOperations name="getContainingJavaClass" eType="#//JavaClass"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return the java class that this method is defined in."/> + </eAnnotations> + </eOperations> + <eOperations name="getMethodElementSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return a String with the the method name and its parameters. e.g. <code> setFirstName(java.lang.String) </code> .
 "/> + </eAnnotations> + </eOperations> <eOperations name="getParameter" eType="#//JavaParameter"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return a Parameter with the passed name, or null."/> + </eAnnotations> <eParameters name="parameterName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eOperations> - <eOperations name="getReturnType" eType="#//JTypeJavaHelpers"/> + <eOperations name="getReturnType" eType="#//JTypeJavaHelpers"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Get the return type."/> + </eAnnotations> + </eOperations> <eOperations name="setReturnType"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Set the return type"/> + </eAnnotations> <eParameters name="type" eType="#//JTypeJavaHelpers"/> </eOperations> - <eOperations name="getSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eOperations name="isGenerated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eOperations name="getSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Replicate the functionality of java.lang.reflect.Method.toString().

Returns a string describing this Method. The string is formatted as the method access modifiers, if any, followed by the method return type, followed by a space, followed by the class declaring the method, followed by a period, followed by the method name, followed by a parenthesized, comma-separated list of the method's formal parameter types. If the method throws checked exceptions, the parameter list is followed by a space, followed by the word throws followed by a comma-separated list of the thrown exception types.

For example:

 public boolean java.lang.Object.equals(java.lang.Object)

The access modifiers are placed in canonical order as specified by "The Java Language Specification". This is public, <tt>protected</tt> or <tt>private</tt> first, and then other modifiers in the following order: <tt>abstract</tt>, <tt>static</tt>, <tt>final</tt>, <tt>synchronized</tt> <tt>native</tt>.
"/> + </eAnnotations> + </eOperations> + <eOperations name="isGenerated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Returns true if the method is system generated.
This is usually determined by the @generated tag in the comment."/> + </eAnnotations> + </eOperations> <eOperations name="setIsGenerated"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Set the isGenerated flag."/> + </eAnnotations> <eParameters name="generated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> </eOperations> - <eOperations name="isVoid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eReferences name="parameters" eType="#//JavaParameter" upperBound="-1" containment="true"/> - <eReferences name="javaExceptions" eType="#//JavaClass" upperBound="-1"/> - <eReferences name="javaClass" eType="#//JavaClass" transient="true" eOpposite="#//JavaClass/methods"/> - <eReferences name="source" eType="#//Block"/> - <eAttributes name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="native" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="synchronized" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="constructor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="javaVisibility" eType="#//JavaVisibilityKind"/> + <eOperations name="isVoid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Is this a void return type method."/> + </eAnnotations> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="native" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="synchronized" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaVisibility" eType="#//JavaVisibilityKind"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1" + eType="#//JavaParameter" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaExceptions" upperBound="-1" + eType="#//JavaClass"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass" + transient="true" eOpposite="#//JavaClass/methods"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Block"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Field" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EAttribute"> - <eOperations name="getContainingJavaClass" eType="#//JavaClass"/> - <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eReferences name="javaClass" eType="#//JavaClass" transient="true" eOpposite="#//JavaClass/fields"/> - <eReferences name="initializer" eType="#//Block" containment="true"/> - <eAttributes name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eAttributes name="javaVisibility" eType="#//JavaVisibilityKind"/> + <eOperations name="getContainingJavaClass" eType="#//JavaClass"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Get the class that this field is within."/> + </eAnnotations> + </eOperations> + <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Is this field an array type."/> + </eAnnotations> + </eOperations> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaVisibility" eType="#//JavaVisibilityKind"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass" + transient="true" eOpposite="#//JavaClass/fields"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" eType="#//Block" + containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="TypeKind"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4"/> + </eAnnotations> <eLiterals name="UNDEFINED"/> <eLiterals name="CLASS" value="1"/> <eLiterals name="INTERFACE" value="2"/> <eLiterals name="EXCEPTION" value="3"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Block"> - <eReferences name="contents" eType="#//Block" upperBound="-1" containment="true"/> - <eAttributes name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eAttributes name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1" + eType="#//Block" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//Block"/> <eClassifiers xsi:type="ecore:EClass" name="Statement" eSuperTypes="#//Block"/> <eClassifiers xsi:type="ecore:EClass" name="JavaPackage" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EPackage"> - <eReferences name="javaClasses" eType="#//JavaClass" changeable="false" volatile="true" - transient="true" upperBound="-1" eOpposite="#//JavaClass/javaPackage"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="javaClasses" upperBound="-1" + eType="#//JavaClass" changeable="false" volatile="true" transient="true" eOpposite="#//JavaClass/javaPackage"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="JavaVisibilityKind"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="PACKAGE=1
PUBLIC=2
PRIVATE=3
PROTECTED=4"/> + </eAnnotations> <eLiterals name="PUBLIC"/> <eLiterals name="PRIVATE" value="1"/> <eLiterals name="PROTECTED" value="2"/> <eLiterals name="PACKAGE" value="3"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="JavaParameterKind"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="IN=0
OUT=1
INOUT=2
RETURN=3"/> + </eAnnotations> <eLiterals name="IN"/> <eLiterals name="OUT" value="1"/> <eLiterals name="INOUT" value="2"/> <eLiterals name="RETURN" value="3"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="JavaDataType" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EClass"> - <eOperations name="getDefaultValueString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eOperations name="getDefaultValueString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Return the default string representing the default value of the primitive."/> + </eAnnotations> + </eOperations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ArrayType" eSuperTypes="#//JavaClass"> - <eOperations name="getFinalComponentType" eType="#//JTypeJavaHelpers"/> - <eOperations name="getComponentTypeAsHelper" eType="#//JTypeJavaHelpers"/> - <eOperations name="isPrimitiveArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Describes a Java Array type
 For multi-dimensional arrays, it is unlikely that the component type will be
 specified directly. This would require instantiating a chain of component types
 such as String[][][][]->String[][][]->String[][]->String[]->String.

 The component type relationship will be computed if the finalComponentType
 and array dimensions is specified.
 
 For this reason, the preferred way to create is through the JavaRefFactory factory method:
 createArrayType(JavaClass finalComponentType, int dimensions)"/> + </eAnnotations> + <eOperations name="getFinalComponentType" eType="#//JTypeJavaHelpers"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Get the final component type for this Array Type.

In order to ensure a unique instance, we will resolve this type using reflection. It turns out to be most efficient to just do this by trimming the name."/> + </eAnnotations> + </eOperations> + <eOperations name="getComponentTypeAsHelper" eType="#//JTypeJavaHelpers"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Get the component type of this array. 

If this is a multi-dimensional array, the component type will be the nested array type."/> + </eAnnotations> + </eOperations> + <eOperations name="isPrimitiveArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Is this an array of java primitives"/> + </eAnnotations> + </eOperations> <eOperations name="setComponentType"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="Set the component type."/> + </eAnnotations> <eParameters name="helperComponentType" eType="#//JTypeJavaHelpers"/> </eOperations> - <eReferences name="componentType" eType="ecore:EClass ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EClassifier" - lowerBound="1"/> - <eAttributes name="arrayDimensions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="arrayDimensions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" lowerBound="1" + eType="ecore:EClass ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EClassifier"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="JTypeJavaHelpers" instanceClassName="org.eclipse.jem.java.JavaHelpers"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="This interface is a common interface between JavaClass and JavaDataType plus some common helper methods."/> + </eAnnotations> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="JTypeList" instanceClassName="java.util.List"> + <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> + <details key="documentation" value="java.util.List type"/> + </eAnnotations> </eClassifiers> - <eClassifiers xsi:type="ecore:EDataType" name="JTypeJavaHelpers" instanceClassName="org.eclipse.jem.internal.java.JavaHelpers"/> - <eClassifiers xsi:type="ecore:EDataType" name="JTypeList" instanceClassName="java.util.List"/> <eClassifiers xsi:type="ecore:EClass" name="JavaEvent" abstract="true" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EStructuralFeature"/> </ecore:EPackage> diff --git a/plugins/org.eclipse.jem/model/javaModel.genmodel b/plugins/org.eclipse.jem/model/javaModel.genmodel index 328f3eb8c..55e09b4b0 100644 --- a/plugins/org.eclipse.jem/model/javaModel.genmodel +++ b/plugins/org.eclipse.jem/model/javaModel.genmodel @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> -<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/mofjava" +<genmodel:GenModel xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/mofjava" editDirectory="/org.eclipse.jem.edit/src" editorDirectory="/org.eclipse.jem.editor/src" modelPluginID="" modelName="Java" modelPluginClass="" editPluginClass="java.provider.JavaEditPlugin" editorPluginClass="java.presentation.JavaEditorPlugin" updateClasspath="false" @@ -8,7 +9,7 @@ <foreignModel>..\rose\javaModel.mdl</foreignModel> <foreignModel>WorkspaceRoot</foreignModel> <foreignModel>../..</foreignModel> - <genPackages prefix="JavaRef" basePackage="org.eclipse.jem.internal" ecorePackage="java.ecore#/"> + <genPackages prefix="JavaRef" basePackage="org.eclipse.jem" ecorePackage="java.ecore#/"> <genEnums ecoreEnum="java.ecore#//TypeKind"> <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/UNDEFINED"/> <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/CLASS"/> diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java index cd101f052..21cce55ce 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.adapters; *******************************************************************************/ /* * $RCSfile: JavaReflectionAdapterFactory.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.jem.internal.java.JavaRefPackage; +import org.eclipse.jem.java.JavaRefPackage; public abstract class JavaReflectionAdapterFactory extends AdapterFactoryImpl { // Maintain a mapping of the source objects to the adaptors which have // relfected from them. This allows a flush operation to force those diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java index 76d16dca4..9473c2a78 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.adapters; *******************************************************************************/ /* * $RCSfile: JavaReflectionAdaptor.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.List; @@ -20,7 +20,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.*; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jem.internal.core.MsgLogger; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; /** * @@ -63,7 +63,7 @@ public Block createBlock(String name, String sourceString) { * setSuper - set our supertype here, implemented interface are handled separately */ public JavaClass createJavaClassRef(String targetName) { - JavaClass ref = org.eclipse.jem.internal.java.impl.JavaRefFactoryImpl.getActiveFactory().createJavaClass(); + JavaClass ref = org.eclipse.jem.java.impl.JavaRefFactoryImpl.getActiveFactory().createJavaClass(); JavaURL javaurl = new JavaURL(targetName); ((InternalEObject) ref).eSetProxyURI(URI.createURI(javaurl.getFullString())); return ref; @@ -108,7 +108,7 @@ public List getArrayDimensions(String typeName) { /* Get the Java Factory */ protected static JavaRefFactory getJavaFactory() { - return ((org.eclipse.jem.internal.java.JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jem.internal.java.JavaRefPackage.eNS_URI)).getJavaRefFactory(); + return ((org.eclipse.jem.java.JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jem.java.JavaRefPackage.eNS_URI)).getJavaRefFactory(); } public abstract Object getReflectionSource(); /** diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java index cd1b19083..58c956d64 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.adapters; *******************************************************************************/ /* * $RCSfile: JavaReflectionKey.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.*; @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.*; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.XMIResource; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; /** * This key handles Java Reflection. It creates the appropriate type of entries if diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java index 1cbdd15d1..d80f40e58 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.adapters; *******************************************************************************/ /* * $RCSfile: JavaXMIFactoryImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import java.io.IOException; import java.util.*; @@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.XMIResource; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; -import org.eclipse.jem.internal.java.JavaPackage; -import org.eclipse.jem.internal.java.JavaRefFactory; -import org.eclipse.jem.internal.java.impl.JavaFactoryImpl; +import org.eclipse.jem.java.JavaPackage; +import org.eclipse.jem.java.JavaRefFactory; +import org.eclipse.jem.java.impl.JavaFactoryImpl; /** * Factory to create the Resource for the Java protocol. diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java index 5d87db820..5dde389a2 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java @@ -11,14 +11,14 @@ package org.eclipse.jem.internal.java.adapters.jdk; *******************************************************************************/ /* * $RCSfile: JDKAdaptor.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import java.lang.reflect.Array; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.ecore.xmi.XMIResource; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor; /** * Insert the type's description here. @@ -139,7 +139,7 @@ public abstract class JDKAdaptor extends JavaReflectionAdaptor { /** * Insert the method's description here. * Creation date: (11/07/00 3:43:55 PM) - * @return org.eclipse.jem.internal.java.adapters.JavaJDKAdapterFactory + * @return org.eclipse.jem.java.adapters.JavaJDKAdapterFactory */ public JavaJDKAdapterFactory getAdapterFactory() { return adapterFactory; @@ -304,7 +304,7 @@ public abstract class JDKAdaptor extends JavaReflectionAdaptor { /** * Insert the method's description here. * Creation date: (11/07/00 3:43:55 PM) - * @param newAdapterFactory org.eclipse.jem.internal.java.adapters.JavaJDKAdapterFactory + * @param newAdapterFactory org.eclipse.jem.java.adapters.JavaJDKAdapterFactory */ public void setAdapterFactory(JavaJDKAdapterFactory newAdapterFactory) { adapterFactory = newAdapterFactory; diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java index 950a958e6..dffbf6a84 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.adapters.jdk; *******************************************************************************/ /* * $RCSfile: JavaClassJDKAdaptor.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.List; @@ -21,12 +21,12 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.xmi.XMIResource; import org.eclipse.jem.internal.core.MsgLogger; -import org.eclipse.jem.internal.java.InheritanceCycleException; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.TypeKind; +import org.eclipse.jem.java.InheritanceCycleException; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.TypeKind; import org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor; import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler; -import org.eclipse.jem.internal.java.impl.JavaClassImpl; +import org.eclipse.jem.java.impl.JavaClassImpl; /** * Insert the type's description here. @@ -121,7 +121,7 @@ protected boolean flushModifiers() { } /** - * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#flushReflectedValues(boolean) + * @see org.eclipse.jem.java.adapters.JavaReflectionAdaptor#flushReflectedValues(boolean) */ protected boolean flushReflectedValues(boolean clearCachedModelObject) { boolean result = flushModifiers(); @@ -134,7 +134,7 @@ protected boolean flushReflectedValues(boolean clearCachedModelObject) { } /** - * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#postFlushReflectedValuesIfNecessary() + * @see org.eclipse.jem.java.adapters.JavaReflectionAdaptor#postFlushReflectedValuesIfNecessary() */ protected void postFlushReflectedValuesIfNecessary(boolean isExisting) { getJavaClassTarget().setReflected(false); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java index 85bca98cd..16f3188c3 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java @@ -11,12 +11,12 @@ package org.eclipse.jem.internal.java.adapters.jdk; *******************************************************************************/ /* * $RCSfile: JavaFieldJDKAdaptor.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; import org.eclipse.jem.internal.java.adapters.ReadAdaptor; /** * Insert the type's description here. diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java index a5c27c08f..f3af81145 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.adapters.jdk; *******************************************************************************/ /* * $RCSfile: JavaMethodJDKAdaptor.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.List; @@ -20,9 +20,9 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.xmi.XMIResource; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; import org.eclipse.jem.internal.java.adapters.ReadAdaptor; -import org.eclipse.jem.internal.java.impl.MethodImpl; +import org.eclipse.jem.java.impl.MethodImpl; /** * Insert the type's description here. * Creation date: (6/6/2000 4:42:50 PM) diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java index 4970c7f2d..2f68e7d4f 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.beaninfo; *******************************************************************************/ /* * $RCSfile: IIntrospectionAdapter.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; @@ -28,8 +28,7 @@ public interface IIntrospectionAdapter extends org.eclipse.emf.common.notify.Ada public void introspect(); public void introspectIfNecessary(); public boolean isStale(); - public EList getEAttributes(); - public EList getEReferences(); + public EList getEStructuralFeatures(); public EList getEOperations(); public BasicEList getEAllOperations(); public EList getEvents(); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java index 80a7dcf69..b3e3be257 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java @@ -11,13 +11,13 @@ package org.eclipse.jem.internal.java.init; *******************************************************************************/ /* * $RCSfile: JavaInit.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; -import org.eclipse.jem.internal.java.JavaRefPackage; +import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl; /** diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java index bb1067a39..94d0b1597 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java @@ -11,11 +11,11 @@ package org.eclipse.jem.internal.java.instantiation; *******************************************************************************/ /* * $RCSfile: IInstantiationHandler.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.3 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.*; -import org.eclipse.jem.internal.java.JavaDataType; +import org.eclipse.jem.java.JavaDataType; /** * The interface for the Instantiation handler. The actual implementation diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java index 50fc3ab1e..89fef2539 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java @@ -11,11 +11,11 @@ package org.eclipse.jem.internal.java.instantiation; *******************************************************************************/ /* * $RCSfile: IInstantiationHandlerFactoryAdapter.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.jem.internal.java.impl.JavaFactoryImpl; +import org.eclipse.jem.java.impl.JavaFactoryImpl; /** * This adapter is a factory for IInstantiationHandler's. It is attached as diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java index ecc59d137..aefc9448f 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java @@ -11,9 +11,9 @@ package org.eclipse.jem.internal.java.instantiation; *******************************************************************************/ /* * $RCSfile: IInstantiationInstance.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.2 $ $Date: 2004/01/13 16:16:21 $ */ -import org.eclipse.jem.internal.java.JavaHelpers; +import org.eclipse.jem.java.JavaHelpers; /** * The interface for an instance. The actual implementation diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/ArrayType.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java index c247ad2e1..a9e8b05bc 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/ArrayType.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: ArrayType.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EClassifier; @@ -49,7 +49,7 @@ public interface ArrayType extends JavaClass{ EClassifier getComponentType(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.ArrayType#getComponentType <em>Component Type</em>}' reference. + * Sets the value of the '{@link org.eclipse.jem.java.ArrayType#getComponentType <em>Component Type</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Component Type</em>' reference. diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Block.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java index 75f0ab727..5fc46c813 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Block.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: Block.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.util.EList; diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Comment.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java index 42ac13c31..6d2409efa 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Comment.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: Comment.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Field.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java index cd5365e4b..35e52eeb4 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Field.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: Field.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EAttribute; /** @@ -27,7 +27,7 @@ public interface Field extends EAttribute{ boolean isFinal(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Field#isFinal <em>Final</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Field#isFinal <em>Final</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Final</em>' attribute. @@ -43,7 +43,7 @@ public interface Field extends EAttribute{ boolean isStatic(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Field#isStatic <em>Static</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Field#isStatic <em>Static</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Static</em>' attribute. @@ -59,11 +59,11 @@ public interface Field extends EAttribute{ JavaVisibilityKind getJavaVisibility(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Field#getJavaVisibility <em>Java Visibility</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Field#getJavaVisibility <em>Java Visibility</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Java Visibility</em>' attribute. - * @see org.eclipse.jem.internal.java.JavaVisibilityKind + * @see org.eclipse.jem.java.JavaVisibilityKind * @see #getJavaVisibility() * @generated */ @@ -76,7 +76,7 @@ public interface Field extends EAttribute{ JavaClass getJavaClass(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Field#getJavaClass <em>Java Class</em>}' container reference. + * Sets the value of the '{@link org.eclipse.jem.java.Field#getJavaClass <em>Java Class</em>}' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Java Class</em>' container reference. @@ -92,7 +92,7 @@ public interface Field extends EAttribute{ Block getInitializer(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Field#getInitializer <em>Initializer</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jem.java.Field#getInitializer <em>Initializer</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Initializer</em>' containment reference. diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/InheritanceCycleException.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java index a65be942c..b895cb183 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/InheritanceCycleException.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: InheritanceCycleException.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.text.MessageFormat; diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Initializer.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java index 34dcf8ad2..f11f75d0f 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Initializer.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: Initializer.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EObject; /** @@ -39,7 +39,7 @@ public interface Initializer extends EObject{ JavaClass getJavaClass(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Initializer#getJavaClass <em>Java Class</em>}' container reference. + * Sets the value of the '{@link org.eclipse.jem.java.Initializer#getJavaClass <em>Java Class</em>}' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Java Class</em>' container reference. @@ -55,7 +55,7 @@ public interface Initializer extends EObject{ Block getSource(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Initializer#getSource <em>Source</em>}' reference. + * Sets the value of the '{@link org.eclipse.jem.java.Initializer#getSource <em>Source</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Source</em>' reference. diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaClass.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java index 43d724b55..72ba99c60 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaClass.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaClass.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.List; @@ -25,24 +25,24 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getKind <em>Kind</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#isPublic <em>Public</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#isFinal <em>Final</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getImplementsInterfaces <em>Implements Interfaces</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getClassImport <em>Class Import</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getPackageImports <em>Package Imports</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getFields <em>Fields</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getMethods <em>Methods</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getInitializers <em>Initializers</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getDeclaredClasses <em>Declared Classes</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getJavaPackage <em>Java Package</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getEvents <em>Events</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.JavaClass#getAllEvents <em>All Events</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getKind <em>Kind</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getImplementsInterfaces <em>Implements Interfaces</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getClassImport <em>Class Import</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getPackageImports <em>Package Imports</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getFields <em>Fields</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getMethods <em>Methods</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getInitializers <em>Initializers</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getDeclaredClasses <em>Declared Classes</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getJavaPackage <em>Java Package</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getEvents <em>Events</em>}</li> + * <li>{@link org.eclipse.jem.java.JavaClass#getAllEvents <em>All Events</em>}</li> * </ul> * </p> * - * @see org.eclipse.jem.internal.java.JavaRefPackage#getJavaClass() + * @see org.eclipse.jem.java.JavaRefPackage#getJavaClass() * @model * @generated */ @@ -79,11 +79,11 @@ public interface JavaClass extends EClass, JavaHelpers{ TypeKind getKind(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.JavaClass#getKind <em>Kind</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#getKind <em>Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Kind</em>' attribute. - * @see org.eclipse.jem.internal.java.TypeKind + * @see org.eclipse.jem.java.TypeKind * @see #getKind() * @generated */ @@ -96,7 +96,7 @@ public interface JavaClass extends EClass, JavaHelpers{ boolean isPublic(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.JavaClass#isPublic <em>Public</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Public</em>' attribute. @@ -112,7 +112,7 @@ public interface JavaClass extends EClass, JavaHelpers{ boolean isFinal(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.JavaClass#isFinal <em>Final</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Final</em>' attribute. @@ -164,7 +164,7 @@ public interface JavaClass extends EClass, JavaHelpers{ JavaClass getDeclaringClass(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}' reference. + * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Declaring Class</em>' reference. @@ -193,7 +193,7 @@ public interface JavaClass extends EClass, JavaHelpers{ /** * Returns the value of the '<em><b>All Events</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jem.internal.java.JavaEvent}. + * The list contents are of type {@link org.eclipse.jem.java.JavaEvent}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>All Events</em>' reference list isn't clear, @@ -201,8 +201,8 @@ public interface JavaClass extends EClass, JavaHelpers{ * </p> * <!-- end-user-doc --> * @return the value of the '<em>All Events</em>' reference list. - * @see org.eclipse.jem.internal.java.JavaRefPackage#getJavaClass_AllEvents() - * @model type="org.eclipse.jem.internal.java.JavaEvent" transient="true" volatile="true" + * @see org.eclipse.jem.java.JavaRefPackage#getJavaClass_AllEvents() + * @model type="org.eclipse.jem.java.JavaEvent" transient="true" volatile="true" * @generated */ EList getAllEvents(); @@ -341,6 +341,9 @@ public interface JavaClass extends EClass, JavaHelpers{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * Is this an interface. + * <!-- end-model-doc --> * @model * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaDataType.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java index d8652f5c4..ed5619071 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaDataType.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaDataType.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EClass; @@ -21,10 +21,8 @@ import org.eclipse.emf.ecore.EClass; * @extends JavaHelpers * <!-- end-user-doc --> * - * <p> - * </p> * - * @see org.eclipse.jem.internal.java.JavaRefPackage#getJavaDataType() + * @see org.eclipse.jem.java.JavaRefPackage#getJavaDataType() * @model * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaEvent.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java index bc2c1481b..c13c40a96 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaEvent.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaEvent.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EStructuralFeature; @@ -20,10 +20,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; * A representation of the model object '<em><b>Java Event</b></em>'. * <!-- end-user-doc --> * - * <p> - * </p> * - * @see org.eclipse.jem.internal.java.JavaRefPackage#getJavaEvent() + * @see org.eclipse.jem.java.JavaRefPackage#getJavaEvent() * @model abstract="true" * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaHelpers.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java index 145a09c92..f17a95c4c 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaHelpers.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaHelpers.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaPackage.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java index 27f385ff7..cac2eb7ec 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaPackage.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaPackage.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.util.EList; diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaParameter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java index e7eb1dc35..6f3ae094a 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaParameter.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaParameter.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EModelElement; @@ -29,7 +29,7 @@ public interface JavaParameter extends EParameter, EModelElement{ boolean isFinal(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.JavaParameter#isFinal <em>Final</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.JavaParameter#isFinal <em>Final</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Final</em>' attribute. @@ -45,11 +45,11 @@ public interface JavaParameter extends EParameter, EModelElement{ JavaParameterKind getParameterKind(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.JavaParameter#getParameterKind <em>Parameter Kind</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.JavaParameter#getParameterKind <em>Parameter Kind</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Parameter Kind</em>' attribute. - * @see org.eclipse.jem.internal.java.JavaParameterKind + * @see org.eclipse.jem.java.JavaParameterKind * @see #getParameterKind() * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaParameterKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java index 449fc8aa8..b0569bb12 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaParameterKind.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaParameterKind.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Arrays; import java.util.Collections; @@ -25,7 +25,13 @@ import org.eclipse.emf.common.util.AbstractEnumerator; * A representation of the literals of the enumeration '<em><b>Java Parameter Kind</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jem.internal.java.JavaRefPackage#getJavaParameterKind() + * <!-- begin-model-doc --> + * IN=0 + * OUT=1 + * INOUT=2 + * RETURN=3 + * <!-- end-model-doc --> + * @see org.eclipse.jem.java.JavaRefPackage#getJavaParameterKind() * @model * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaRefFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java index 509faf28a..4ad079ad9 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaRefFactory.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaRefFactory.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EFactory; @@ -27,7 +27,7 @@ public interface JavaRefFactory extends EFactory{ * <!-- end-user-doc --> * @generated */ - JavaRefFactory eINSTANCE = new org.eclipse.jem.internal.java.impl.JavaRefFactoryImpl(); + JavaRefFactory eINSTANCE = new org.eclipse.jem.java.impl.JavaRefFactoryImpl(); /** diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaRefPackage.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java index 0a63be87a..c74c2da06 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaRefPackage.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaRefPackage.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -137,7 +137,7 @@ public interface JavaRefPackage extends EPackage{ int JAVA_CLASS__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES; /** - * The feature id for the '<em><b>EReferences</b></em>' containment reference list. + * The feature id for the '<em><b>EReferences</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -146,7 +146,7 @@ public interface JavaRefPackage extends EPackage{ int JAVA_CLASS__EREFERENCES = EcorePackage.ECLASS__EREFERENCES; /** - * The feature id for the '<em><b>EAttributes</b></em>' containment reference list. + * The feature id for the '<em><b>EAttributes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -200,6 +200,15 @@ public interface JavaRefPackage extends EPackage{ int JAVA_CLASS__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE; /** + * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_CLASS__ESTRUCTURAL_FEATURES = EcorePackage.ECLASS__ESTRUCTURAL_FEATURES; + + /** * @generated This field/method will be replaced during code generation. */ int JAVA_CLASS__KIND = EcorePackage.ECLASS_FEATURE_COUNT + 0; @@ -359,6 +368,60 @@ public interface JavaRefPackage extends EPackage{ */ int JAVA_PARAMETER__NAME = EcorePackage.EPARAMETER__NAME; /** + * The feature id for the '<em><b>Ordered</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_PARAMETER__ORDERED = EcorePackage.EPARAMETER__ORDERED; + + /** + * The feature id for the '<em><b>Unique</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_PARAMETER__UNIQUE = EcorePackage.EPARAMETER__UNIQUE; + + /** + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_PARAMETER__LOWER_BOUND = EcorePackage.EPARAMETER__LOWER_BOUND; + + /** + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_PARAMETER__UPPER_BOUND = EcorePackage.EPARAMETER__UPPER_BOUND; + + /** + * The feature id for the '<em><b>Many</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_PARAMETER__MANY = EcorePackage.EPARAMETER__MANY; + + /** + * The feature id for the '<em><b>Required</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_PARAMETER__REQUIRED = EcorePackage.EPARAMETER__REQUIRED; + + /** * The feature id for the '<em><b>EType</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -412,6 +475,60 @@ public interface JavaRefPackage extends EPackage{ */ int METHOD__NAME = EcorePackage.EOPERATION__NAME; /** + * The feature id for the '<em><b>Ordered</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int METHOD__ORDERED = EcorePackage.EOPERATION__ORDERED; + + /** + * The feature id for the '<em><b>Unique</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int METHOD__UNIQUE = EcorePackage.EOPERATION__UNIQUE; + + /** + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int METHOD__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND; + + /** + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int METHOD__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND; + + /** + * The feature id for the '<em><b>Many</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int METHOD__MANY = EcorePackage.EOPERATION__MANY; + + /** + * The feature id for the '<em><b>Required</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int METHOD__REQUIRED = EcorePackage.EOPERATION__REQUIRED; + + /** * The feature id for the '<em><b>EType</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -544,103 +661,112 @@ public interface JavaRefPackage extends EPackage{ */ int FIELD__NAME = EcorePackage.EATTRIBUTE__NAME; /** - * The feature id for the '<em><b>EType</b></em>' reference. + * The feature id for the '<em><b>Ordered</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__ETYPE = EcorePackage.EATTRIBUTE__ETYPE; + int FIELD__ORDERED = EcorePackage.EATTRIBUTE__ORDERED; /** - * The feature id for the '<em><b>Changeable</b></em>' attribute. + * The feature id for the '<em><b>Unique</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__CHANGEABLE = EcorePackage.EATTRIBUTE__CHANGEABLE; + int FIELD__UNIQUE = EcorePackage.EATTRIBUTE__UNIQUE; /** - * The feature id for the '<em><b>Volatile</b></em>' attribute. + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__VOLATILE = EcorePackage.EATTRIBUTE__VOLATILE; + int FIELD__LOWER_BOUND = EcorePackage.EATTRIBUTE__LOWER_BOUND; /** - * The feature id for the '<em><b>Transient</b></em>' attribute. + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__TRANSIENT = EcorePackage.EATTRIBUTE__TRANSIENT; + int FIELD__UPPER_BOUND = EcorePackage.EATTRIBUTE__UPPER_BOUND; /** - * The feature id for the '<em><b>Unique</b></em>' attribute. + * The feature id for the '<em><b>Many</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__UNIQUE = EcorePackage.EATTRIBUTE__UNIQUE; + int FIELD__MANY = EcorePackage.EATTRIBUTE__MANY; /** - * The feature id for the '<em><b>Default Value Literal</b></em>' attribute. + * The feature id for the '<em><b>Required</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__DEFAULT_VALUE_LITERAL = EcorePackage.EATTRIBUTE__DEFAULT_VALUE_LITERAL; + int FIELD__REQUIRED = EcorePackage.EATTRIBUTE__REQUIRED; /** - * The feature id for the '<em><b>Default Value</b></em>' attribute. + * The feature id for the '<em><b>EType</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__DEFAULT_VALUE = EcorePackage.EATTRIBUTE__DEFAULT_VALUE; + int FIELD__ETYPE = EcorePackage.EATTRIBUTE__ETYPE; /** - * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * The feature id for the '<em><b>Changeable</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__LOWER_BOUND = EcorePackage.EATTRIBUTE__LOWER_BOUND; + int FIELD__CHANGEABLE = EcorePackage.EATTRIBUTE__CHANGEABLE; /** - * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * The feature id for the '<em><b>Volatile</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__UPPER_BOUND = EcorePackage.EATTRIBUTE__UPPER_BOUND; + int FIELD__VOLATILE = EcorePackage.EATTRIBUTE__VOLATILE; /** - * The feature id for the '<em><b>Many</b></em>' attribute. + * The feature id for the '<em><b>Transient</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__MANY = EcorePackage.EATTRIBUTE__MANY; + int FIELD__TRANSIENT = EcorePackage.EATTRIBUTE__TRANSIENT; /** - * The feature id for the '<em><b>Required</b></em>' attribute. + * The feature id for the '<em><b>Default Value Literal</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FIELD__REQUIRED = EcorePackage.EATTRIBUTE__REQUIRED; + int FIELD__DEFAULT_VALUE_LITERAL = EcorePackage.EATTRIBUTE__DEFAULT_VALUE_LITERAL; + + /** + * The feature id for the '<em><b>Default Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int FIELD__DEFAULT_VALUE = EcorePackage.EATTRIBUTE__DEFAULT_VALUE; /** * The feature id for the '<em><b>Unsettable</b></em>' attribute. @@ -652,7 +778,16 @@ public interface JavaRefPackage extends EPackage{ int FIELD__UNSETTABLE = EcorePackage.EATTRIBUTE__UNSETTABLE; /** - * The feature id for the '<em><b>EContaining Class</b></em>' reference. + * The feature id for the '<em><b>Derived</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int FIELD__DERIVED = EcorePackage.EATTRIBUTE__DERIVED; + + /** + * The feature id for the '<em><b>EContaining Class</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -957,7 +1092,7 @@ public interface JavaRefPackage extends EPackage{ int JAVA_DATA_TYPE__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES; /** - * The feature id for the '<em><b>EReferences</b></em>' containment reference list. + * The feature id for the '<em><b>EReferences</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -966,7 +1101,7 @@ public interface JavaRefPackage extends EPackage{ int JAVA_DATA_TYPE__EREFERENCES = EcorePackage.ECLASS__EREFERENCES; /** - * The feature id for the '<em><b>EAttributes</b></em>' containment reference list. + * The feature id for the '<em><b>EAttributes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -1020,6 +1155,15 @@ public interface JavaRefPackage extends EPackage{ int JAVA_DATA_TYPE__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE; /** + * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES = EcorePackage.ECLASS__ESTRUCTURAL_FEATURES; + + /** * The number of structural features of the the '<em>Java Data Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1127,7 +1271,7 @@ public interface JavaRefPackage extends EPackage{ int ARRAY_TYPE__EALL_REFERENCES = JAVA_CLASS__EALL_REFERENCES; /** - * The feature id for the '<em><b>EReferences</b></em>' containment reference list. + * The feature id for the '<em><b>EReferences</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -1136,7 +1280,7 @@ public interface JavaRefPackage extends EPackage{ int ARRAY_TYPE__EREFERENCES = JAVA_CLASS__EREFERENCES; /** - * The feature id for the '<em><b>EAttributes</b></em>' containment reference list. + * The feature id for the '<em><b>EAttributes</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -1190,6 +1334,15 @@ public interface JavaRefPackage extends EPackage{ int ARRAY_TYPE__EID_ATTRIBUTE = JAVA_CLASS__EID_ATTRIBUTE; /** + * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ARRAY_TYPE__ESTRUCTURAL_FEATURES = JAVA_CLASS__ESTRUCTURAL_FEATURES; + + /** * @generated This field/method will be replaced during code generation. */ int ARRAY_TYPE__KIND = JAVA_CLASS__KIND; @@ -1286,103 +1439,112 @@ public interface JavaRefPackage extends EPackage{ */ int JAVA_EVENT__NAME = EcorePackage.ESTRUCTURAL_FEATURE__NAME; /** - * The feature id for the '<em><b>EType</b></em>' reference. + * The feature id for the '<em><b>Ordered</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__ETYPE = EcorePackage.ESTRUCTURAL_FEATURE__ETYPE; + int JAVA_EVENT__ORDERED = EcorePackage.ESTRUCTURAL_FEATURE__ORDERED; /** - * The feature id for the '<em><b>Changeable</b></em>' attribute. + * The feature id for the '<em><b>Unique</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__CHANGEABLE = EcorePackage.ESTRUCTURAL_FEATURE__CHANGEABLE; + int JAVA_EVENT__UNIQUE = EcorePackage.ESTRUCTURAL_FEATURE__UNIQUE; /** - * The feature id for the '<em><b>Volatile</b></em>' attribute. + * The feature id for the '<em><b>Lower Bound</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__VOLATILE = EcorePackage.ESTRUCTURAL_FEATURE__VOLATILE; + int JAVA_EVENT__LOWER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__LOWER_BOUND; /** - * The feature id for the '<em><b>Transient</b></em>' attribute. + * The feature id for the '<em><b>Upper Bound</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__TRANSIENT = EcorePackage.ESTRUCTURAL_FEATURE__TRANSIENT; + int JAVA_EVENT__UPPER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__UPPER_BOUND; /** - * The feature id for the '<em><b>Unique</b></em>' attribute. + * The feature id for the '<em><b>Many</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__UNIQUE = EcorePackage.ESTRUCTURAL_FEATURE__UNIQUE; + int JAVA_EVENT__MANY = EcorePackage.ESTRUCTURAL_FEATURE__MANY; /** - * The feature id for the '<em><b>Default Value Literal</b></em>' attribute. + * The feature id for the '<em><b>Required</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__DEFAULT_VALUE_LITERAL = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE_LITERAL; + int JAVA_EVENT__REQUIRED = EcorePackage.ESTRUCTURAL_FEATURE__REQUIRED; /** - * The feature id for the '<em><b>Default Value</b></em>' attribute. + * The feature id for the '<em><b>EType</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__DEFAULT_VALUE = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE; + int JAVA_EVENT__ETYPE = EcorePackage.ESTRUCTURAL_FEATURE__ETYPE; /** - * The feature id for the '<em><b>Lower Bound</b></em>' attribute. + * The feature id for the '<em><b>Changeable</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__LOWER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__LOWER_BOUND; + int JAVA_EVENT__CHANGEABLE = EcorePackage.ESTRUCTURAL_FEATURE__CHANGEABLE; /** - * The feature id for the '<em><b>Upper Bound</b></em>' attribute. + * The feature id for the '<em><b>Volatile</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__UPPER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__UPPER_BOUND; + int JAVA_EVENT__VOLATILE = EcorePackage.ESTRUCTURAL_FEATURE__VOLATILE; /** - * The feature id for the '<em><b>Many</b></em>' attribute. + * The feature id for the '<em><b>Transient</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__MANY = EcorePackage.ESTRUCTURAL_FEATURE__MANY; + int JAVA_EVENT__TRANSIENT = EcorePackage.ESTRUCTURAL_FEATURE__TRANSIENT; /** - * The feature id for the '<em><b>Required</b></em>' attribute. + * The feature id for the '<em><b>Default Value Literal</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int JAVA_EVENT__REQUIRED = EcorePackage.ESTRUCTURAL_FEATURE__REQUIRED; + int JAVA_EVENT__DEFAULT_VALUE_LITERAL = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE_LITERAL; + + /** + * The feature id for the '<em><b>Default Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_EVENT__DEFAULT_VALUE = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE; /** * The feature id for the '<em><b>Unsettable</b></em>' attribute. @@ -1394,7 +1556,16 @@ public interface JavaRefPackage extends EPackage{ int JAVA_EVENT__UNSETTABLE = EcorePackage.ESTRUCTURAL_FEATURE__UNSETTABLE; /** - * The feature id for the '<em><b>EContaining Class</b></em>' reference. + * The feature id for the '<em><b>Derived</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JAVA_EVENT__DERIVED = EcorePackage.ESTRUCTURAL_FEATURE__DERIVED; + + /** + * The feature id for the '<em><b>EContaining Class</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -1423,8 +1594,8 @@ public interface JavaRefPackage extends EPackage{ * The meta object id for the '<em>JType Java Helpers</em>' data type. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jem.internal.java.JavaHelpers - * @see org.eclipse.jem.internal.java.impl.JavaRefPackageImpl#getJTypeJavaHelpers() + * @see org.eclipse.jem.java.JavaHelpers + * @see org.eclipse.jem.java.impl.JavaRefPackageImpl#getJTypeJavaHelpers() * @generated */ int JTYPE_JAVA_HELPERS = 15; @@ -1434,7 +1605,7 @@ public interface JavaRefPackage extends EPackage{ * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.util.List - * @see org.eclipse.jem.internal.java.impl.JavaRefPackageImpl#getJTypeList() + * @see org.eclipse.jem.java.impl.JavaRefPackageImpl#getJTypeList() * @generated */ int JTYPE_LIST = 16; @@ -1454,7 +1625,7 @@ public interface JavaRefPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "org.eclipse.jem.internal.java"; + String eNS_PREFIX = "org.eclipse.jem.java"; /** * The singleton instance of the package. @@ -1462,7 +1633,7 @@ public interface JavaRefPackage extends EPackage{ * <!-- end-user-doc --> * @generated */ - JavaRefPackage eINSTANCE = org.eclipse.jem.internal.java.impl.JavaRefPackageImpl.init(); + JavaRefPackage eINSTANCE = org.eclipse.jem.java.impl.JavaRefPackageImpl.init(); /** * @generated This field/method will be replaced during code generation @@ -1476,22 +1647,22 @@ public interface JavaRefPackage extends EPackage{ EAttribute getJavaClass_Kind(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.JavaClass#isPublic <em>Public</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Public</em>'. - * @see org.eclipse.jem.internal.java.JavaClass#isPublic() + * @see org.eclipse.jem.java.JavaClass#isPublic() * @see #getJavaClass() * @generated */ EAttribute getJavaClass_Public(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.JavaClass#isFinal <em>Final</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Final</em>'. - * @see org.eclipse.jem.internal.java.JavaClass#isFinal() + * @see org.eclipse.jem.java.JavaClass#isFinal() * @see #getJavaClass() * @generated */ @@ -1559,22 +1730,22 @@ public interface JavaRefPackage extends EPackage{ EClass getField(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Field#isFinal <em>Final</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isFinal <em>Final</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Final</em>'. - * @see org.eclipse.jem.internal.java.Field#isFinal() + * @see org.eclipse.jem.java.Field#isFinal() * @see #getField() * @generated */ EAttribute getField_Final(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Field#isStatic <em>Static</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isStatic <em>Static</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Static</em>'. - * @see org.eclipse.jem.internal.java.Field#isStatic() + * @see org.eclipse.jem.java.Field#isStatic() * @see #getField() * @generated */ @@ -1602,66 +1773,66 @@ public interface JavaRefPackage extends EPackage{ EClass getMethod(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Method#isAbstract <em>Abstract</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isAbstract <em>Abstract</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Abstract</em>'. - * @see org.eclipse.jem.internal.java.Method#isAbstract() + * @see org.eclipse.jem.java.Method#isAbstract() * @see #getMethod() * @generated */ EAttribute getMethod_Abstract(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Method#isNative <em>Native</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isNative <em>Native</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Native</em>'. - * @see org.eclipse.jem.internal.java.Method#isNative() + * @see org.eclipse.jem.java.Method#isNative() * @see #getMethod() * @generated */ EAttribute getMethod_Native(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Method#isSynchronized <em>Synchronized</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isSynchronized <em>Synchronized</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Synchronized</em>'. - * @see org.eclipse.jem.internal.java.Method#isSynchronized() + * @see org.eclipse.jem.java.Method#isSynchronized() * @see #getMethod() * @generated */ EAttribute getMethod_Synchronized(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Method#isFinal <em>Final</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isFinal <em>Final</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Final</em>'. - * @see org.eclipse.jem.internal.java.Method#isFinal() + * @see org.eclipse.jem.java.Method#isFinal() * @see #getMethod() * @generated */ EAttribute getMethod_Final(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Method#isConstructor <em>Constructor</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isConstructor <em>Constructor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Constructor</em>'. - * @see org.eclipse.jem.internal.java.Method#isConstructor() + * @see org.eclipse.jem.java.Method#isConstructor() * @see #getMethod() * @generated */ EAttribute getMethod_Constructor(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.Method#isStatic <em>Static</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isStatic <em>Static</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Static</em>'. - * @see org.eclipse.jem.internal.java.Method#isStatic() + * @see org.eclipse.jem.java.Method#isStatic() * @see #getMethod() * @generated */ @@ -1699,11 +1870,11 @@ public interface JavaRefPackage extends EPackage{ EClass getJavaParameter(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.java.JavaParameter#isFinal <em>Final</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaParameter#isFinal <em>Final</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Final</em>'. - * @see org.eclipse.jem.internal.java.JavaParameter#isFinal() + * @see org.eclipse.jem.java.JavaParameter#isFinal() * @see #getJavaParameter() * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaURL.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java index 5e2a5892c..38e46136b 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaURL.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,11 +11,11 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaURL.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ -public class JavaURL extends org.eclipse.jem.internal.java.impl.URL { +public class JavaURL extends org.eclipse.jem.java.impl.URL { public static final String JAVA_PROTOCOL_URI_PREFIX = "java:/"; /** * JavaURL constructor comment. diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaVisibilityKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java index c84d9f8cd..e01391fa0 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/JavaVisibilityKind.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: JavaVisibilityKind.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Arrays; import java.util.Collections; @@ -24,7 +24,13 @@ import org.eclipse.emf.common.util.AbstractEnumerator; * A representation of the literals of the enumeration '<em><b>Java Visibility Kind</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jem.internal.java.JavaRefPackage#getJavaVisibilityKind() + * <!-- begin-model-doc --> + * PACKAGE=1 + * PUBLIC=2 + * PRIVATE=3 + * PROTECTED=4 + * <!-- end-model-doc --> + * @see org.eclipse.jem.java.JavaRefPackage#getJavaVisibilityKind() * @model * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Method.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java index 05bab7915..e90b611f3 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Method.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: Method.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EOperation; @@ -34,7 +34,7 @@ public interface Method extends EOperation{ boolean isAbstract(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#isAbstract <em>Abstract</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Method#isAbstract <em>Abstract</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Abstract</em>' attribute. @@ -50,7 +50,7 @@ public interface Method extends EOperation{ boolean isNative(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#isNative <em>Native</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Method#isNative <em>Native</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Native</em>' attribute. @@ -66,7 +66,7 @@ public interface Method extends EOperation{ boolean isSynchronized(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#isSynchronized <em>Synchronized</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Method#isSynchronized <em>Synchronized</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Synchronized</em>' attribute. @@ -82,7 +82,7 @@ public interface Method extends EOperation{ boolean isFinal(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#isFinal <em>Final</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Method#isFinal <em>Final</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Final</em>' attribute. @@ -98,7 +98,7 @@ public interface Method extends EOperation{ boolean isConstructor(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#isConstructor <em>Constructor</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Method#isConstructor <em>Constructor</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Constructor</em>' attribute. @@ -114,7 +114,7 @@ public interface Method extends EOperation{ boolean isStatic(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#isStatic <em>Static</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Method#isStatic <em>Static</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Static</em>' attribute. @@ -130,11 +130,11 @@ public interface Method extends EOperation{ JavaVisibilityKind getJavaVisibility(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#getJavaVisibility <em>Java Visibility</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jem.java.Method#getJavaVisibility <em>Java Visibility</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Java Visibility</em>' attribute. - * @see org.eclipse.jem.internal.java.JavaVisibilityKind + * @see org.eclipse.jem.java.JavaVisibilityKind * @see #getJavaVisibility() * @generated */ @@ -159,7 +159,7 @@ public interface Method extends EOperation{ JavaClass getJavaClass(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#getJavaClass <em>Java Class</em>}' container reference. + * Sets the value of the '{@link org.eclipse.jem.java.Method#getJavaClass <em>Java Class</em>}' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Java Class</em>' container reference. @@ -175,7 +175,7 @@ public interface Method extends EOperation{ Block getSource(); /** - * Sets the value of the '{@link org.eclipse.jem.internal.java.Method#getSource <em>Source</em>}' reference. + * Sets the value of the '{@link org.eclipse.jem.java.Method#getSource <em>Source</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Source</em>' reference. @@ -213,7 +213,10 @@ public interface Method extends EOperation{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @model parameters="org.eclipse.jem.internal.java.JTypeJavaHelpers" + * <!-- begin-model-doc --> + * Set the return type + * <!-- end-model-doc --> + * @model parameters="org.eclipse.jem.java.JTypeJavaHelpers" * @generated */ void setReturnType(JavaHelpers type); @@ -253,6 +256,9 @@ public interface Method extends EOperation{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * Set the isGenerated flag. + * <!-- end-model-doc --> * @model * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Statement.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java index 66404412e..60cc01006 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/Statement.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: Statement.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ /** diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/TypeKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java index b1663c7f3..0e346364a 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/TypeKind.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java; +package org.eclipse.jem.java; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java; *******************************************************************************/ /* * $RCSfile: TypeKind.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Arrays; import java.util.Collections; @@ -24,7 +24,10 @@ import org.eclipse.emf.common.util.AbstractEnumerator; * A representation of the literals of the enumeration '<em><b>Type Kind</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jem.internal.java.JavaRefPackage#getTypeKind() + * <!-- begin-model-doc --> + * UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4 + * <!-- end-model-doc --> + * @see org.eclipse.jem.java.JavaRefPackage#getTypeKind() * @model * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/ArrayTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/ArrayTypeImpl.java index 26d33b55a..2387365f0 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/ArrayTypeImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/ArrayTypeImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: ArrayTypeImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -25,14 +25,13 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.ArrayType; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaHelpers; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.TypeKind; +import org.eclipse.jem.java.ArrayType; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaHelpers; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.TypeKind; /** * Describes a Java Array type @@ -217,9 +216,9 @@ public boolean isExistingType() { case JavaRefPackage.ARRAY_TYPE__EALL_REFERENCES: return !getEAllReferences().isEmpty(); case JavaRefPackage.ARRAY_TYPE__EREFERENCES: - return eReferences != null && !eReferences.isEmpty(); + return !getEReferences().isEmpty(); case JavaRefPackage.ARRAY_TYPE__EATTRIBUTES: - return eAttributes != null && !eAttributes.isEmpty(); + return !getEAttributes().isEmpty(); case JavaRefPackage.ARRAY_TYPE__EALL_CONTAINMENTS: return !getEAllContainments().isEmpty(); case JavaRefPackage.ARRAY_TYPE__EALL_OPERATIONS: @@ -230,6 +229,8 @@ public boolean isExistingType() { return !getEAllSuperTypes().isEmpty(); case JavaRefPackage.ARRAY_TYPE__EID_ATTRIBUTE: return getEIDAttribute() != null; + case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES: + return eStructuralFeatures != null && !eStructuralFeatures.isEmpty(); case JavaRefPackage.ARRAY_TYPE__KIND: return kind != KIND_EDEFAULT; case JavaRefPackage.ARRAY_TYPE__PUBLIC: @@ -296,13 +297,9 @@ public boolean isExistingType() { getEOperations().clear(); getEOperations().addAll((Collection)newValue); return; - case JavaRefPackage.ARRAY_TYPE__EREFERENCES: - getEReferences().clear(); - getEReferences().addAll((Collection)newValue); - return; - case JavaRefPackage.ARRAY_TYPE__EATTRIBUTES: - getEAttributes().clear(); - getEAttributes().addAll((Collection)newValue); + case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES: + getEStructuralFeatures().clear(); + getEStructuralFeatures().addAll((Collection)newValue); return; case JavaRefPackage.ARRAY_TYPE__KIND: setKind((TypeKind)newValue); @@ -389,11 +386,8 @@ public boolean isExistingType() { case JavaRefPackage.ARRAY_TYPE__EOPERATIONS: getEOperations().clear(); return; - case JavaRefPackage.ARRAY_TYPE__EREFERENCES: - getEReferences().clear(); - return; - case JavaRefPackage.ARRAY_TYPE__EATTRIBUTES: - getEAttributes().clear(); + case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES: + getEStructuralFeatures().clear(); return; case JavaRefPackage.ARRAY_TYPE__KIND: setKind(KIND_EDEFAULT); @@ -465,7 +459,7 @@ public boolean isExistingType() { { if (componentType != null && componentType.eIsProxy()) { EClassifier oldComponentType = componentType; - componentType = (EClassifier)EcoreUtil.resolve(componentType, this); + componentType = (EClassifier)eResolveProxy((InternalEObject)componentType); if (componentType != oldComponentType) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE, oldComponentType, componentType)); @@ -514,6 +508,8 @@ public boolean isExistingType() { return eBasicSetContainer(otherEnd, JavaRefPackage.ARRAY_TYPE__EPACKAGE, msgs); case JavaRefPackage.ARRAY_TYPE__EOPERATIONS: return ((InternalEList)getEOperations()).basicAdd(otherEnd, msgs); + case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES: + return ((InternalEList)getEStructuralFeatures()).basicAdd(otherEnd, msgs); case JavaRefPackage.ARRAY_TYPE__FIELDS: return ((InternalEList)getFields()).basicAdd(otherEnd, msgs); case JavaRefPackage.ARRAY_TYPE__METHODS: @@ -550,10 +546,8 @@ public boolean isExistingType() { return eBasicSetContainer(null, JavaRefPackage.ARRAY_TYPE__EPACKAGE, msgs); case JavaRefPackage.ARRAY_TYPE__EOPERATIONS: return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs); - case JavaRefPackage.ARRAY_TYPE__EREFERENCES: - return ((InternalEList)getEReferences()).basicRemove(otherEnd, msgs); - case JavaRefPackage.ARRAY_TYPE__EATTRIBUTES: - return ((InternalEList)getEAttributes()).basicRemove(otherEnd, msgs); + case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES: + return ((InternalEList)getEStructuralFeatures()).basicRemove(otherEnd, msgs); case JavaRefPackage.ARRAY_TYPE__FIELDS: return ((InternalEList)getFields()).basicRemove(otherEnd, msgs); case JavaRefPackage.ARRAY_TYPE__METHODS: @@ -637,6 +631,8 @@ public boolean isExistingType() { return getEAllSuperTypes(); case JavaRefPackage.ARRAY_TYPE__EID_ATTRIBUTE: return getEIDAttribute(); + case JavaRefPackage.ARRAY_TYPE__ESTRUCTURAL_FEATURES: + return getEStructuralFeatures(); case JavaRefPackage.ARRAY_TYPE__KIND: return getKind(); case JavaRefPackage.ARRAY_TYPE__PUBLIC: diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/BlockImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/BlockImpl.java index 294e681a6..be902a23a 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/BlockImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/BlockImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: BlockImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -28,8 +28,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.Block; -import org.eclipse.jem.internal.java.JavaRefPackage; +import org.eclipse.jem.java.Block; +import org.eclipse.jem.java.JavaRefPackage; /** * @generated diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/CommentImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/CommentImpl.java index bfc020c7f..1a1d8fc8d 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/CommentImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/CommentImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: CommentImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.Comment; -import org.eclipse.jem.internal.java.JavaRefPackage; +import org.eclipse.jem.java.Comment; +import org.eclipse.jem.java.JavaRefPackage; /** * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/FieldImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/FieldImpl.java index e9a9af21b..6327a8d72 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/FieldImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/FieldImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: FieldImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -23,19 +23,20 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EAttributeImpl; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.Block; -import org.eclipse.jem.internal.java.Field; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaHelpers; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.JavaURL; -import org.eclipse.jem.internal.java.JavaVisibilityKind; +import org.eclipse.jem.java.Block; +import org.eclipse.jem.java.Field; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaHelpers; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.JavaURL; +import org.eclipse.jem.java.JavaVisibilityKind; import org.eclipse.jem.internal.java.adapters.ReadAdaptor; /** @@ -323,6 +324,18 @@ protected ReadAdaptor getReadAdaptor() { return eAnnotations != null && !eAnnotations.isEmpty(); case JavaRefPackage.FIELD__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case JavaRefPackage.FIELD__ORDERED: + return ordered != ORDERED_EDEFAULT; + case JavaRefPackage.FIELD__UNIQUE: + return unique != UNIQUE_EDEFAULT; + case JavaRefPackage.FIELD__LOWER_BOUND: + return lowerBound != LOWER_BOUND_EDEFAULT; + case JavaRefPackage.FIELD__UPPER_BOUND: + return upperBound != UPPER_BOUND_EDEFAULT; + case JavaRefPackage.FIELD__MANY: + return isMany() != false; + case JavaRefPackage.FIELD__REQUIRED: + return isRequired() != false; case JavaRefPackage.FIELD__ETYPE: return eType != null; case JavaRefPackage.FIELD__CHANGEABLE: @@ -331,22 +344,14 @@ protected ReadAdaptor getReadAdaptor() { return volatile_ != VOLATILE_EDEFAULT; case JavaRefPackage.FIELD__TRANSIENT: return transient_ != TRANSIENT_EDEFAULT; - case JavaRefPackage.FIELD__UNIQUE: - return unique != UNIQUE_EDEFAULT; case JavaRefPackage.FIELD__DEFAULT_VALUE_LITERAL: return DEFAULT_VALUE_LITERAL_EDEFAULT == null ? defaultValueLiteral != null : !DEFAULT_VALUE_LITERAL_EDEFAULT.equals(defaultValueLiteral); case JavaRefPackage.FIELD__DEFAULT_VALUE: return getDefaultValue() != null; - case JavaRefPackage.FIELD__LOWER_BOUND: - return lowerBound != LOWER_BOUND_EDEFAULT; - case JavaRefPackage.FIELD__UPPER_BOUND: - return upperBound != UPPER_BOUND_EDEFAULT; - case JavaRefPackage.FIELD__MANY: - return isMany() != false; - case JavaRefPackage.FIELD__REQUIRED: - return isRequired() != false; case JavaRefPackage.FIELD__UNSETTABLE: return unsettable != UNSETTABLE_EDEFAULT; + case JavaRefPackage.FIELD__DERIVED: + return derived != DERIVED_EDEFAULT; case JavaRefPackage.FIELD__ECONTAINING_CLASS: return getEContainingClass() != null; case JavaRefPackage.FIELD__ID: @@ -380,6 +385,18 @@ protected ReadAdaptor getReadAdaptor() { case JavaRefPackage.FIELD__NAME: setName((String)newValue); return; + case JavaRefPackage.FIELD__ORDERED: + setOrdered(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.FIELD__UNIQUE: + setUnique(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.FIELD__LOWER_BOUND: + setLowerBound(((Integer)newValue).intValue()); + return; + case JavaRefPackage.FIELD__UPPER_BOUND: + setUpperBound(((Integer)newValue).intValue()); + return; case JavaRefPackage.FIELD__ETYPE: setEType((EClassifier)newValue); return; @@ -392,21 +409,15 @@ protected ReadAdaptor getReadAdaptor() { case JavaRefPackage.FIELD__TRANSIENT: setTransient(((Boolean)newValue).booleanValue()); return; - case JavaRefPackage.FIELD__UNIQUE: - setUnique(((Boolean)newValue).booleanValue()); - return; case JavaRefPackage.FIELD__DEFAULT_VALUE_LITERAL: setDefaultValueLiteral((String)newValue); return; - case JavaRefPackage.FIELD__LOWER_BOUND: - setLowerBound(((Integer)newValue).intValue()); - return; - case JavaRefPackage.FIELD__UPPER_BOUND: - setUpperBound(((Integer)newValue).intValue()); - return; case JavaRefPackage.FIELD__UNSETTABLE: setUnsettable(((Boolean)newValue).booleanValue()); return; + case JavaRefPackage.FIELD__DERIVED: + setDerived(((Boolean)newValue).booleanValue()); + return; case JavaRefPackage.FIELD__ID: setID(((Boolean)newValue).booleanValue()); return; @@ -441,6 +452,18 @@ protected ReadAdaptor getReadAdaptor() { case JavaRefPackage.FIELD__NAME: setName(NAME_EDEFAULT); return; + case JavaRefPackage.FIELD__ORDERED: + setOrdered(ORDERED_EDEFAULT); + return; + case JavaRefPackage.FIELD__UNIQUE: + setUnique(UNIQUE_EDEFAULT); + return; + case JavaRefPackage.FIELD__LOWER_BOUND: + setLowerBound(LOWER_BOUND_EDEFAULT); + return; + case JavaRefPackage.FIELD__UPPER_BOUND: + setUpperBound(UPPER_BOUND_EDEFAULT); + return; case JavaRefPackage.FIELD__ETYPE: setEType((EClassifier)null); return; @@ -453,21 +476,15 @@ protected ReadAdaptor getReadAdaptor() { case JavaRefPackage.FIELD__TRANSIENT: setTransient(TRANSIENT_EDEFAULT); return; - case JavaRefPackage.FIELD__UNIQUE: - setUnique(UNIQUE_EDEFAULT); - return; case JavaRefPackage.FIELD__DEFAULT_VALUE_LITERAL: setDefaultValueLiteral(DEFAULT_VALUE_LITERAL_EDEFAULT); return; - case JavaRefPackage.FIELD__LOWER_BOUND: - setLowerBound(LOWER_BOUND_EDEFAULT); - return; - case JavaRefPackage.FIELD__UPPER_BOUND: - setUpperBound(UPPER_BOUND_EDEFAULT); - return; case JavaRefPackage.FIELD__UNSETTABLE: setUnsettable(UNSETTABLE_EDEFAULT); return; + case JavaRefPackage.FIELD__DERIVED: + setDerived(DERIVED_EDEFAULT); + return; case JavaRefPackage.FIELD__ID: setID(ID_EDEFAULT); return; @@ -545,6 +562,10 @@ protected ReadAdaptor getReadAdaptor() { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { case JavaRefPackage.FIELD__EANNOTATIONS: return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs); + case JavaRefPackage.FIELD__ECONTAINING_CLASS: + if (eContainer != null) + msgs = eBasicRemoveFromContainer(msgs); + return eBasicSetContainer(otherEnd, JavaRefPackage.FIELD__ECONTAINING_CLASS, msgs); case JavaRefPackage.FIELD__JAVA_CLASS: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); @@ -569,6 +590,8 @@ protected ReadAdaptor getReadAdaptor() { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { case JavaRefPackage.FIELD__EANNOTATIONS: return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs); + case JavaRefPackage.FIELD__ECONTAINING_CLASS: + return eBasicSetContainer(null, JavaRefPackage.FIELD__ECONTAINING_CLASS, msgs); case JavaRefPackage.FIELD__JAVA_CLASS: return eBasicSetContainer(null, JavaRefPackage.FIELD__JAVA_CLASS, msgs); case JavaRefPackage.FIELD__INITIALIZER: @@ -589,6 +612,8 @@ protected ReadAdaptor getReadAdaptor() { { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { + case JavaRefPackage.FIELD__ECONTAINING_CLASS: + return ((InternalEObject)eContainer).eInverseRemove(this, EcorePackage.ECLASS__ESTRUCTURAL_FEATURES, EClass.class, msgs); case JavaRefPackage.FIELD__JAVA_CLASS: return ((InternalEObject)eContainer).eInverseRemove(this, JavaRefPackage.JAVA_CLASS__FIELDS, JavaClass.class, msgs); default: @@ -610,6 +635,18 @@ protected ReadAdaptor getReadAdaptor() { return getEAnnotations(); case JavaRefPackage.FIELD__NAME: return getName(); + case JavaRefPackage.FIELD__ORDERED: + return isOrdered() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.FIELD__UNIQUE: + return isUnique() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.FIELD__LOWER_BOUND: + return new Integer(getLowerBound()); + case JavaRefPackage.FIELD__UPPER_BOUND: + return new Integer(getUpperBound()); + case JavaRefPackage.FIELD__MANY: + return isMany() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.FIELD__REQUIRED: + return isRequired() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.FIELD__ETYPE: if (resolve) return getEType(); return basicGetEType(); @@ -619,22 +656,14 @@ protected ReadAdaptor getReadAdaptor() { return isVolatile() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.FIELD__TRANSIENT: return isTransient() ? Boolean.TRUE : Boolean.FALSE; - case JavaRefPackage.FIELD__UNIQUE: - return isUnique() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.FIELD__DEFAULT_VALUE_LITERAL: return getDefaultValueLiteral(); case JavaRefPackage.FIELD__DEFAULT_VALUE: return getDefaultValue(); - case JavaRefPackage.FIELD__LOWER_BOUND: - return new Integer(getLowerBound()); - case JavaRefPackage.FIELD__UPPER_BOUND: - return new Integer(getUpperBound()); - case JavaRefPackage.FIELD__MANY: - return isMany() ? Boolean.TRUE : Boolean.FALSE; - case JavaRefPackage.FIELD__REQUIRED: - return isRequired() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.FIELD__UNSETTABLE: return isUnsettable() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.FIELD__DERIVED: + return isDerived() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.FIELD__ECONTAINING_CLASS: return getEContainingClass(); case JavaRefPackage.FIELD__ID: diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/InitializerImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/InitializerImpl.java index 8cf9834a9..fa3e0ed13 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/InitializerImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/InitializerImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: InitializerImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jem.internal.java.Block; -import org.eclipse.jem.internal.java.Initializer; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaRefPackage; +import org.eclipse.jem.java.Block; +import org.eclipse.jem.java.Initializer; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaRefPackage; /** * @generated */ @@ -128,7 +128,7 @@ public class InitializerImpl extends EObjectImpl implements Initializer{ { if (source != null && source.eIsProxy()) { Block oldSource = source; - source = (Block)EcoreUtil.resolve(source, this); + source = (Block)eResolveProxy((InternalEObject)source); if (source != oldSource) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.INITIALIZER__SOURCE, oldSource, source)); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaClassImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaClassImpl.java index 3b3a696e0..253662b7e 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaClassImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaClassImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,16 +11,15 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaClassImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ -import java.util.AbstractSequentialList; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import java.util.Map; import org.eclipse.emf.common.notify.Notification; @@ -47,20 +46,20 @@ import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.Field; -import org.eclipse.jem.internal.java.InheritanceCycleException; -import org.eclipse.jem.internal.java.Initializer; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaDataType; -import org.eclipse.jem.internal.java.JavaEvent; -import org.eclipse.jem.internal.java.JavaHelpers; -import org.eclipse.jem.internal.java.JavaPackage; -import org.eclipse.jem.internal.java.JavaParameter; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.JavaURL; -import org.eclipse.jem.internal.java.JavaVisibilityKind; -import org.eclipse.jem.internal.java.Method; -import org.eclipse.jem.internal.java.TypeKind; +import org.eclipse.jem.java.Field; +import org.eclipse.jem.java.InheritanceCycleException; +import org.eclipse.jem.java.Initializer; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaDataType; +import org.eclipse.jem.java.JavaEvent; +import org.eclipse.jem.java.JavaHelpers; +import org.eclipse.jem.java.JavaPackage; +import org.eclipse.jem.java.JavaParameter; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.JavaURL; +import org.eclipse.jem.java.JavaVisibilityKind; +import org.eclipse.jem.java.Method; +import org.eclipse.jem.java.TypeKind; import org.eclipse.jem.internal.java.adapters.InternalReadAdaptable; import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor; import org.eclipse.jem.internal.java.adapters.ReadAdaptor; @@ -73,20 +72,20 @@ import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getKind <em>Kind</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#isPublic <em>Public</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#isFinal <em>Final</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getImplementsInterfaces <em>Implements Interfaces</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getClassImport <em>Class Import</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getPackageImports <em>Package Imports</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getFields <em>Fields</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getMethods <em>Methods</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getInitializers <em>Initializers</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getDeclaredClasses <em>Declared Classes</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getDeclaringClass <em>Declaring Class</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getJavaPackage <em>Java Package</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getEvents <em>Events</em>}</li> - * <li>{@link org.eclipse.jem.internal.java.impl.JavaClassImpl#getAllEvents <em>All Events</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getKind <em>Kind</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#isPublic <em>Public</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#isFinal <em>Final</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getImplementsInterfaces <em>Implements Interfaces</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getClassImport <em>Class Import</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getPackageImports <em>Package Imports</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getFields <em>Fields</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getMethods <em>Methods</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getInitializers <em>Initializers</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getDeclaredClasses <em>Declared Classes</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getDeclaringClass <em>Declaring Class</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getJavaPackage <em>Java Package</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getEvents <em>Events</em>}</li> + * <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getAllEvents <em>All Events</em>}</li> * </ul> * </p> * @@ -349,20 +348,7 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead eAllOperations = ia.getEAllOperations(); return eAllOperations; } - - public EList getEAttributes() { - IIntrospectionAdapter adapter = getIntrospectionAdapter(); - if (adapter != null) - return adapter.getEAttributes(); - return super.getEAttributes(); - } - - public EList getEAttributesGen() { - // An internal method for returning actual wo fluffing up. - return super.getEAttributes(); - } - public EList getEOperations() { IIntrospectionAdapter adapter = getIntrospectionAdapter(); if (adapter != null) @@ -383,17 +369,18 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead return super.getEAnnotations(); } - public EList getEReferences() { + public EList getEStructuralFeatures() { IIntrospectionAdapter adapter = getIntrospectionAdapter(); if (adapter != null) - return adapter.getEReferences(); - return super.getEReferences(); + return adapter.getEStructuralFeatures(); + return super.getEStructuralFeatures(); } - public EList getEReferencesGen() { + public EList getEStructuralFeaturesGen() { // An internal method for returning actual wo fluffing up. - return super.getEReferences(); - } + return super.getEStructuralFeatures(); + } + /** * Return an Iterator on the implemntsInferface List if this * is an interface class or on the super List if it is a class. @@ -628,6 +615,8 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead return PRIM_FLOAT_NAME; if (myName.equals(DOUBLE_NAME)) return PRIM_DOUBLE_NAME; + if (myName.equals(CHARACTER_NAME)) + return PRIM_CHARACTER_NAME; return null; } /** @@ -1132,7 +1121,7 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead { if (declaringClass != null && declaringClass.eIsProxy()) { JavaClass oldDeclaringClass = declaringClass; - declaringClass = (JavaClass)EcoreUtil.resolve(declaringClass, this); + declaringClass = (JavaClass)eResolveProxy((InternalEObject)declaringClass); if (declaringClass != oldDeclaringClass) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS, oldDeclaringClass, declaringClass)); @@ -1186,12 +1175,8 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead return declaredClasses; } - protected EList properties; public EList getProperties() { - if (properties == null) { - properties = new PropertiesEList(); - } - return properties; + return getEStructuralFeatures(); // As of EMF 2.0, local properties are the local features. Used to be a merge of eattributes and ereferences. } public EList getEvents() { @@ -1269,9 +1254,9 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead case JavaRefPackage.JAVA_CLASS__EALL_REFERENCES: return !getEAllReferences().isEmpty(); case JavaRefPackage.JAVA_CLASS__EREFERENCES: - return eReferences != null && !eReferences.isEmpty(); + return !getEReferences().isEmpty(); case JavaRefPackage.JAVA_CLASS__EATTRIBUTES: - return eAttributes != null && !eAttributes.isEmpty(); + return !getEAttributes().isEmpty(); case JavaRefPackage.JAVA_CLASS__EALL_CONTAINMENTS: return !getEAllContainments().isEmpty(); case JavaRefPackage.JAVA_CLASS__EALL_OPERATIONS: @@ -1282,6 +1267,8 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead return !getEAllSuperTypes().isEmpty(); case JavaRefPackage.JAVA_CLASS__EID_ATTRIBUTE: return getEIDAttribute() != null; + case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES: + return eStructuralFeatures != null && !eStructuralFeatures.isEmpty(); case JavaRefPackage.JAVA_CLASS__KIND: return kind != KIND_EDEFAULT; case JavaRefPackage.JAVA_CLASS__PUBLIC: @@ -1344,13 +1331,9 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead getEOperations().clear(); getEOperations().addAll((Collection)newValue); return; - case JavaRefPackage.JAVA_CLASS__EREFERENCES: - getEReferences().clear(); - getEReferences().addAll((Collection)newValue); - return; - case JavaRefPackage.JAVA_CLASS__EATTRIBUTES: - getEAttributes().clear(); - getEAttributes().addAll((Collection)newValue); + case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES: + getEStructuralFeatures().clear(); + getEStructuralFeatures().addAll((Collection)newValue); return; case JavaRefPackage.JAVA_CLASS__KIND: setKind((TypeKind)newValue); @@ -1431,11 +1414,8 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead case JavaRefPackage.JAVA_CLASS__EOPERATIONS: getEOperations().clear(); return; - case JavaRefPackage.JAVA_CLASS__EREFERENCES: - getEReferences().clear(); - return; - case JavaRefPackage.JAVA_CLASS__EATTRIBUTES: - getEAttributes().clear(); + case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES: + getEStructuralFeatures().clear(); return; case JavaRefPackage.JAVA_CLASS__KIND: setKind(KIND_EDEFAULT); @@ -1620,16 +1600,15 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead public JavaPackage getJavaPackageGen() { JavaPackage javaPackage = basicGetJavaPackage(); - return javaPackage == null ? null : (JavaPackage)EcoreUtil.resolve(javaPackage, this); + return javaPackage == null ? null : (JavaPackage)eResolveProxy((InternalEObject)javaPackage); } - /** + /* * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated modifiable */ public JavaPackage basicGetJavaPackage() { - return null; + return getJavaPackage(); } /** * <!-- begin-user-doc --> @@ -1648,6 +1627,8 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_CLASS__EPACKAGE, msgs); case JavaRefPackage.JAVA_CLASS__EOPERATIONS: return ((InternalEList)getEOperations()).basicAdd(otherEnd, msgs); + case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES: + return ((InternalEList)getEStructuralFeatures()).basicAdd(otherEnd, msgs); case JavaRefPackage.JAVA_CLASS__FIELDS: return ((InternalEList)getFields()).basicAdd(otherEnd, msgs); case JavaRefPackage.JAVA_CLASS__METHODS: @@ -1684,10 +1665,8 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead return eBasicSetContainer(null, JavaRefPackage.JAVA_CLASS__EPACKAGE, msgs); case JavaRefPackage.JAVA_CLASS__EOPERATIONS: return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs); - case JavaRefPackage.JAVA_CLASS__EREFERENCES: - return ((InternalEList)getEReferences()).basicRemove(otherEnd, msgs); - case JavaRefPackage.JAVA_CLASS__EATTRIBUTES: - return ((InternalEList)getEAttributes()).basicRemove(otherEnd, msgs); + case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES: + return ((InternalEList)getEStructuralFeatures()).basicRemove(otherEnd, msgs); case JavaRefPackage.JAVA_CLASS__FIELDS: return ((InternalEList)getFields()).basicRemove(otherEnd, msgs); case JavaRefPackage.JAVA_CLASS__METHODS: @@ -1771,6 +1750,8 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead return getEAllSuperTypes(); case JavaRefPackage.JAVA_CLASS__EID_ATTRIBUTE: return getEIDAttribute(); + case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES: + return getEStructuralFeatures(); case JavaRefPackage.JAVA_CLASS__KIND: return getKind(); case JavaRefPackage.JAVA_CLASS__PUBLIC: @@ -1824,309 +1805,9 @@ public class JavaClassImpl extends EClassImpl implements JavaClass, InternalRead } /** - * @see org.eclipse.jem.internal.java.adapters.InternalReadAdaptable#setReflected(boolean) + * @see org.eclipse.jem.java.adapters.InternalReadAdaptable#setReflected(boolean) */ public void setReflected(boolean aBoolean) { hasReflected = aBoolean; } - - /** - * A special EList that merges together both EAttributes and EReferences without - * actually creating a copy of them. - */ - private class PropertiesEList extends AbstractSequentialList implements EList { - - /** - * @see org.eclipse.emf.common.util.EList#move(int, Object) - */ - public void move(int newPosition, Object object) { - throw new UnsupportedOperationException(); - } - - /** - * @see org.eclipse.emf.common.util.EList#move(int, int) - */ - public Object move(int newPosition, int oldPosition) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.Collection#size() - */ - public int size() { - return getEAttributes().size()+getEReferences().size(); - } - - /** - * @see java.util.Collection#isEmpty() - */ - public boolean isEmpty() { - return getEAttributes().isEmpty() && getEReferences().isEmpty(); - } - - /** - * @see java.util.Collection#contains(Object) - */ - public boolean contains(Object o) { - return getEAttributes().contains(o) || getEReferences().contains(o); - } - - /** - * @see java.util.Collection#toArray() - */ - public Object[] toArray() { - Object[] a = getEAttributes().toArray(); - Object[] r = getEReferences().toArray(); - Object[] p = new Object[a.length+r.length]; - System.arraycopy(a, 0, p, 0, a.length); - System.arraycopy(r, 0, p, a.length, r.length); - return p; - } - - /** - * @see java.util.Collection#toArray(Object[]) - */ - public Object[] toArray(Object[] p) { - int size = size(); - if (p.length < size) - p = (Object[])java.lang.reflect.Array.newInstance( - p.getClass().getComponentType(), size); - - Object[] a = getEAttributes().toArray(); - Object[] r = getEReferences().toArray(); - System.arraycopy(a, 0, p, 0, a.length); - System.arraycopy(r, 0, p, a.length, r.length); - - if (p.length > size) - p[size] = null; - - return p; - } - - /** - * @see java.util.Collection#add(Object) - */ - public boolean add(Object o) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.Collection#remove(Object) - */ - public boolean remove(Object o) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.Collection#addAll(Collection) - */ - public boolean addAll(Collection c) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.List#addAll(int, Collection) - */ - public boolean addAll(int index, Collection c) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.Collection#removeAll(Collection) - */ - public boolean removeAll(Collection c) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.Collection#retainAll(Collection) - */ - public boolean retainAll(Collection c) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.Collection#clear() - */ - public void clear() { - throw new UnsupportedOperationException(); - } - - - /** - * @see java.util.List#get(int) - */ - public Object get(int index) { - int asize = getEAttributes().size(); // Cause introspection and get size. - return (index < asize) ? eAttributes.get(index) : getEReferences().get(index-asize); - } - - /** - * @see java.util.List#set(int, Object) - */ - public Object set(int index, Object element) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.List#add(int, Object) - */ - public void add(int index, Object element) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.List#remove(int) - */ - public Object remove(int index) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.List#indexOf(Object) - */ - public int indexOf(Object o) { - int n = getEAttributes().indexOf(o); - if (n == -1) { - n = getEReferences().indexOf(o); - if (n != -1) - n += eAttributes.size(); - } - return n; - } - - /** - * @see java.util.List#lastIndexOf(Object) - */ - public int lastIndexOf(Object o) { - int n = getEReferences().lastIndexOf(o); - if (n == -1) - n = getEAttributes().lastIndexOf(o); - else { - n += getEAttributes().size(); - } - return n; - } - - private class PropertiesListIterator implements ListIterator { - - private ListIterator currentItr; - private ListIterator nextItr; - - private boolean attrType; - private boolean switchIt; - - public PropertiesListIterator(int index) { - if (index >= getEAttributes().size()) { - attrType = false; - currentItr = getEReferences().listIterator(index-eAttributes.size()); - } else { - attrType = true; - currentItr = eAttributes.listIterator(index); - } - } - /** - * @see java.util.Iterator#hasNext() - */ - public boolean hasNext() { - if (attrType) { - if (currentItr.hasNext()) - return true; - switchIt = true; - if (nextItr == null) - nextItr = getEReferences().listIterator(); - return nextItr.hasNext(); - } else { - return currentItr.hasNext(); - } - } - - /** - * @see java.util.Iterator#next() - */ - public Object next() { - if (switchIt) { - switchIt = false; - ListIterator t = currentItr; - currentItr = nextItr; - nextItr = t; - attrType = false; - } - return currentItr.next(); - } - - /** - * @see java.util.ListIterator#hasPrevious() - */ - public boolean hasPrevious() { - if (!attrType) { - if (currentItr.hasPrevious()) - return true; - switchIt = true; - if (nextItr == null) - nextItr = getEAttributes().listIterator(eAttributes.size()); - return nextItr.hasPrevious(); - } else { - return currentItr.hasPrevious(); - } - } - - /** - * @see java.util.ListIterator#previous() - */ - public Object previous() { - if (switchIt) { - switchIt = false; - ListIterator t = currentItr; - currentItr = nextItr; - nextItr = t; - attrType = true; - } - return currentItr.previous(); - } - - /** - * @see java.util.ListIterator#nextIndex() - */ - public int nextIndex() { - return attrType ? currentItr.nextIndex() : currentItr.nextIndex()+eAttributes.size(); - } - - /** - * @see java.util.ListIterator#previousIndex() - */ - public int previousIndex() { - return attrType ? currentItr.previousIndex() : currentItr.previousIndex()+eAttributes.size(); - } - - /** - * @see java.util.Iterator#remove() - */ - public void remove() { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.ListIterator#set(Object) - */ - public void set(Object o) { - throw new UnsupportedOperationException(); - } - - /** - * @see java.util.ListIterator#add(Object) - */ - public void add(Object o) { - throw new UnsupportedOperationException(); - } - } - - /** - * @see java.util.List#listIterator(int) - */ - public ListIterator listIterator(int index) { - return new PropertiesListIterator(index); - } - - } } diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaDataTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaDataTypeImpl.java index bccd597ed..a30e08fe0 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaDataTypeImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaDataTypeImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaDataTypeImpl.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -26,9 +26,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EClassImpl; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaDataType; -import org.eclipse.jem.internal.java.JavaRefPackage; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaDataType; +import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance; /** * @generated @@ -151,6 +151,8 @@ public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{ return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE, msgs); case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS: return ((InternalEList)getEOperations()).basicAdd(otherEnd, msgs); + case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES: + return ((InternalEList)getEStructuralFeatures()).basicAdd(otherEnd, msgs); default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } @@ -175,10 +177,8 @@ public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{ return eBasicSetContainer(null, JavaRefPackage.JAVA_DATA_TYPE__EPACKAGE, msgs); case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS: return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs); - case JavaRefPackage.JAVA_DATA_TYPE__EREFERENCES: - return ((InternalEList)getEReferences()).basicRemove(otherEnd, msgs); - case JavaRefPackage.JAVA_DATA_TYPE__EATTRIBUTES: - return ((InternalEList)getEAttributes()).basicRemove(otherEnd, msgs); + case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES: + return ((InternalEList)getEStructuralFeatures()).basicRemove(otherEnd, msgs); default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } @@ -250,6 +250,8 @@ public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{ return getEAllSuperTypes(); case JavaRefPackage.JAVA_DATA_TYPE__EID_ATTRIBUTE: return getEIDAttribute(); + case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES: + return getEStructuralFeatures(); } return eDynamicGet(eFeature, resolve); } @@ -286,13 +288,9 @@ public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{ getEOperations().clear(); getEOperations().addAll((Collection)newValue); return; - case JavaRefPackage.JAVA_DATA_TYPE__EREFERENCES: - getEReferences().clear(); - getEReferences().addAll((Collection)newValue); - return; - case JavaRefPackage.JAVA_DATA_TYPE__EATTRIBUTES: - getEAttributes().clear(); - getEAttributes().addAll((Collection)newValue); + case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES: + getEStructuralFeatures().clear(); + getEStructuralFeatures().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -327,11 +325,8 @@ public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{ case JavaRefPackage.JAVA_DATA_TYPE__EOPERATIONS: getEOperations().clear(); return; - case JavaRefPackage.JAVA_DATA_TYPE__EREFERENCES: - getEReferences().clear(); - return; - case JavaRefPackage.JAVA_DATA_TYPE__EATTRIBUTES: - getEAttributes().clear(); + case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES: + getEStructuralFeatures().clear(); return; } eDynamicUnset(eFeature); @@ -370,9 +365,9 @@ public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{ case JavaRefPackage.JAVA_DATA_TYPE__EALL_REFERENCES: return !getEAllReferences().isEmpty(); case JavaRefPackage.JAVA_DATA_TYPE__EREFERENCES: - return eReferences != null && !eReferences.isEmpty(); + return !getEReferences().isEmpty(); case JavaRefPackage.JAVA_DATA_TYPE__EATTRIBUTES: - return eAttributes != null && !eAttributes.isEmpty(); + return !getEAttributes().isEmpty(); case JavaRefPackage.JAVA_DATA_TYPE__EALL_CONTAINMENTS: return !getEAllContainments().isEmpty(); case JavaRefPackage.JAVA_DATA_TYPE__EALL_OPERATIONS: @@ -383,12 +378,14 @@ public class JavaDataTypeImpl extends EClassImpl implements JavaDataType{ return !getEAllSuperTypes().isEmpty(); case JavaRefPackage.JAVA_DATA_TYPE__EID_ATTRIBUTE: return getEIDAttribute() != null; + case JavaRefPackage.JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES: + return eStructuralFeatures != null && !eStructuralFeatures.isEmpty(); } return eDynamicIsSet(eFeature); } /* (non-Javadoc) - * @see org.eclipse.jem.internal.java.JavaHelpers#getQualifiedNameForReflection() + * @see org.eclipse.jem.java.JavaHelpers#getQualifiedNameForReflection() */ public String getQualifiedNameForReflection() { return getJavaName(); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaEventImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaEventImpl.java index eac975a1c..db32ec597 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaEventImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaEventImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaEventImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -19,12 +19,13 @@ import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.JavaEvent; -import org.eclipse.jem.internal.java.JavaRefPackage; +import org.eclipse.jem.java.JavaEvent; +import org.eclipse.jem.java.JavaRefPackage; /** * <!-- begin-user-doc --> @@ -67,6 +68,10 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja switch (eDerivedStructuralFeatureID(featureID, baseClass)) { case JavaRefPackage.JAVA_EVENT__EANNOTATIONS: return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs); + case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS: + if (eContainer != null) + msgs = eBasicRemoveFromContainer(msgs); + return eBasicSetContainer(otherEnd, JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS, msgs); default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } @@ -87,6 +92,8 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja switch (eDerivedStructuralFeatureID(featureID, baseClass)) { case JavaRefPackage.JAVA_EVENT__EANNOTATIONS: return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs); + case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS: + return eBasicSetContainer(null, JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS, msgs); default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } @@ -99,6 +106,23 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja * <!-- end-user-doc --> * @generated */ + public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { + if (eContainerFeatureID >= 0) { + switch (eContainerFeatureID) { + case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS: + return ((InternalEObject)eContainer).eInverseRemove(this, EcorePackage.ECLASS__ESTRUCTURAL_FEATURES, EClass.class, msgs); + default: + return eDynamicBasicRemoveFromContainer(msgs); + } + } + return ((InternalEObject)eContainer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { @@ -106,6 +130,18 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja return getEAnnotations(); case JavaRefPackage.JAVA_EVENT__NAME: return getName(); + case JavaRefPackage.JAVA_EVENT__ORDERED: + return isOrdered() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.JAVA_EVENT__UNIQUE: + return isUnique() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: + return new Integer(getLowerBound()); + case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: + return new Integer(getUpperBound()); + case JavaRefPackage.JAVA_EVENT__MANY: + return isMany() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.JAVA_EVENT__REQUIRED: + return isRequired() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.JAVA_EVENT__ETYPE: if (resolve) return getEType(); return basicGetEType(); @@ -115,22 +151,14 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja return isVolatile() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.JAVA_EVENT__TRANSIENT: return isTransient() ? Boolean.TRUE : Boolean.FALSE; - case JavaRefPackage.JAVA_EVENT__UNIQUE: - return isUnique() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL: return getDefaultValueLiteral(); case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE: return getDefaultValue(); - case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: - return new Integer(getLowerBound()); - case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: - return new Integer(getUpperBound()); - case JavaRefPackage.JAVA_EVENT__MANY: - return isMany() ? Boolean.TRUE : Boolean.FALSE; - case JavaRefPackage.JAVA_EVENT__REQUIRED: - return isRequired() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.JAVA_EVENT__UNSETTABLE: return isUnsettable() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.JAVA_EVENT__DERIVED: + return isDerived() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS: return getEContainingClass(); } @@ -152,6 +180,18 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja case JavaRefPackage.JAVA_EVENT__NAME: setName((String)newValue); return; + case JavaRefPackage.JAVA_EVENT__ORDERED: + setOrdered(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.JAVA_EVENT__UNIQUE: + setUnique(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: + setLowerBound(((Integer)newValue).intValue()); + return; + case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: + setUpperBound(((Integer)newValue).intValue()); + return; case JavaRefPackage.JAVA_EVENT__ETYPE: setEType((EClassifier)newValue); return; @@ -164,21 +204,15 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja case JavaRefPackage.JAVA_EVENT__TRANSIENT: setTransient(((Boolean)newValue).booleanValue()); return; - case JavaRefPackage.JAVA_EVENT__UNIQUE: - setUnique(((Boolean)newValue).booleanValue()); - return; case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL: setDefaultValueLiteral((String)newValue); return; - case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: - setLowerBound(((Integer)newValue).intValue()); - return; - case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: - setUpperBound(((Integer)newValue).intValue()); - return; case JavaRefPackage.JAVA_EVENT__UNSETTABLE: setUnsettable(((Boolean)newValue).booleanValue()); return; + case JavaRefPackage.JAVA_EVENT__DERIVED: + setDerived(((Boolean)newValue).booleanValue()); + return; } eDynamicSet(eFeature, newValue); } @@ -197,6 +231,18 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja case JavaRefPackage.JAVA_EVENT__NAME: setName(NAME_EDEFAULT); return; + case JavaRefPackage.JAVA_EVENT__ORDERED: + setOrdered(ORDERED_EDEFAULT); + return; + case JavaRefPackage.JAVA_EVENT__UNIQUE: + setUnique(UNIQUE_EDEFAULT); + return; + case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: + setLowerBound(LOWER_BOUND_EDEFAULT); + return; + case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: + setUpperBound(UPPER_BOUND_EDEFAULT); + return; case JavaRefPackage.JAVA_EVENT__ETYPE: setEType((EClassifier)null); return; @@ -209,21 +255,15 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja case JavaRefPackage.JAVA_EVENT__TRANSIENT: setTransient(TRANSIENT_EDEFAULT); return; - case JavaRefPackage.JAVA_EVENT__UNIQUE: - setUnique(UNIQUE_EDEFAULT); - return; case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL: setDefaultValueLiteral(DEFAULT_VALUE_LITERAL_EDEFAULT); return; - case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: - setLowerBound(LOWER_BOUND_EDEFAULT); - return; - case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: - setUpperBound(UPPER_BOUND_EDEFAULT); - return; case JavaRefPackage.JAVA_EVENT__UNSETTABLE: setUnsettable(UNSETTABLE_EDEFAULT); return; + case JavaRefPackage.JAVA_EVENT__DERIVED: + setDerived(DERIVED_EDEFAULT); + return; } eDynamicUnset(eFeature); } @@ -240,6 +280,18 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja return eAnnotations != null && !eAnnotations.isEmpty(); case JavaRefPackage.JAVA_EVENT__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case JavaRefPackage.JAVA_EVENT__ORDERED: + return ordered != ORDERED_EDEFAULT; + case JavaRefPackage.JAVA_EVENT__UNIQUE: + return unique != UNIQUE_EDEFAULT; + case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: + return lowerBound != LOWER_BOUND_EDEFAULT; + case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: + return upperBound != UPPER_BOUND_EDEFAULT; + case JavaRefPackage.JAVA_EVENT__MANY: + return isMany() != false; + case JavaRefPackage.JAVA_EVENT__REQUIRED: + return isRequired() != false; case JavaRefPackage.JAVA_EVENT__ETYPE: return eType != null; case JavaRefPackage.JAVA_EVENT__CHANGEABLE: @@ -248,22 +300,14 @@ public abstract class JavaEventImpl extends EStructuralFeatureImpl implements Ja return volatile_ != VOLATILE_EDEFAULT; case JavaRefPackage.JAVA_EVENT__TRANSIENT: return transient_ != TRANSIENT_EDEFAULT; - case JavaRefPackage.JAVA_EVENT__UNIQUE: - return unique != UNIQUE_EDEFAULT; case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL: return DEFAULT_VALUE_LITERAL_EDEFAULT == null ? defaultValueLiteral != null : !DEFAULT_VALUE_LITERAL_EDEFAULT.equals(defaultValueLiteral); case JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE: return getDefaultValue() != null; - case JavaRefPackage.JAVA_EVENT__LOWER_BOUND: - return lowerBound != LOWER_BOUND_EDEFAULT; - case JavaRefPackage.JAVA_EVENT__UPPER_BOUND: - return upperBound != UPPER_BOUND_EDEFAULT; - case JavaRefPackage.JAVA_EVENT__MANY: - return isMany() != false; - case JavaRefPackage.JAVA_EVENT__REQUIRED: - return isRequired() != false; case JavaRefPackage.JAVA_EVENT__UNSETTABLE: return unsettable != UNSETTABLE_EDEFAULT; + case JavaRefPackage.JAVA_EVENT__DERIVED: + return derived != DERIVED_EDEFAULT; case JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS: return getEContainingClass() != null; } diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaFactoryImpl.java index c16d64188..46a514f1f 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaFactoryImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaFactoryImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaFactoryImpl.java,v $ - * $Revision: 1.2 $ $Date: 2004/01/12 21:44:21 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaPackageImpl.java index af3e33497..b2ad2b362 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaPackageImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaPackageImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaPackageImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -31,9 +31,9 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.JavaPackage; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.JavaURL; +import org.eclipse.jem.java.JavaPackage; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.JavaURL; public class JavaPackageImpl extends EPackageImpl implements JavaPackage, EPackage { /** @@ -104,7 +104,7 @@ protected boolean isDefault() { return (result instanceof EClassifier) ? (EClassifier) result : null; } /** - * reflect - reflect a JavaClass for a given package name. + * reflect - reflect a Java package for a given package name. * If the package does not exist, one will be created through * the reflection mechanism. */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaParameterImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaParameterImpl.java index 60e76f1ee..65f948439 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaParameterImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaParameterImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaParameterImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -28,11 +28,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EParameterImpl; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.JavaHelpers; -import org.eclipse.jem.internal.java.JavaParameter; -import org.eclipse.jem.internal.java.JavaParameterKind; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.Method; +import org.eclipse.jem.java.JavaHelpers; +import org.eclipse.jem.java.JavaParameter; +import org.eclipse.jem.java.JavaParameterKind; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.Method; /** * @generated @@ -156,6 +156,18 @@ public class JavaParameterImpl extends EParameterImpl implements JavaParameter{ return eAnnotations != null && !eAnnotations.isEmpty(); case JavaRefPackage.JAVA_PARAMETER__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case JavaRefPackage.JAVA_PARAMETER__ORDERED: + return ordered != ORDERED_EDEFAULT; + case JavaRefPackage.JAVA_PARAMETER__UNIQUE: + return unique != UNIQUE_EDEFAULT; + case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND: + return lowerBound != LOWER_BOUND_EDEFAULT; + case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND: + return upperBound != UPPER_BOUND_EDEFAULT; + case JavaRefPackage.JAVA_PARAMETER__MANY: + return isMany() != false; + case JavaRefPackage.JAVA_PARAMETER__REQUIRED: + return isRequired() != false; case JavaRefPackage.JAVA_PARAMETER__ETYPE: return eType != null; case JavaRefPackage.JAVA_PARAMETER__EOPERATION: @@ -181,6 +193,18 @@ public class JavaParameterImpl extends EParameterImpl implements JavaParameter{ case JavaRefPackage.JAVA_PARAMETER__NAME: setName((String)newValue); return; + case JavaRefPackage.JAVA_PARAMETER__ORDERED: + setOrdered(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.JAVA_PARAMETER__UNIQUE: + setUnique(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND: + setLowerBound(((Integer)newValue).intValue()); + return; + case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND: + setUpperBound(((Integer)newValue).intValue()); + return; case JavaRefPackage.JAVA_PARAMETER__ETYPE: setEType((EClassifier)newValue); return; @@ -206,6 +230,18 @@ public class JavaParameterImpl extends EParameterImpl implements JavaParameter{ case JavaRefPackage.JAVA_PARAMETER__NAME: setName(NAME_EDEFAULT); return; + case JavaRefPackage.JAVA_PARAMETER__ORDERED: + setOrdered(ORDERED_EDEFAULT); + return; + case JavaRefPackage.JAVA_PARAMETER__UNIQUE: + setUnique(UNIQUE_EDEFAULT); + return; + case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND: + setLowerBound(LOWER_BOUND_EDEFAULT); + return; + case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND: + setUpperBound(UPPER_BOUND_EDEFAULT); + return; case JavaRefPackage.JAVA_PARAMETER__ETYPE: setEType((EClassifier)null); return; @@ -309,6 +345,18 @@ public class JavaParameterImpl extends EParameterImpl implements JavaParameter{ return getEAnnotations(); case JavaRefPackage.JAVA_PARAMETER__NAME: return getName(); + case JavaRefPackage.JAVA_PARAMETER__ORDERED: + return isOrdered() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.JAVA_PARAMETER__UNIQUE: + return isUnique() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.JAVA_PARAMETER__LOWER_BOUND: + return new Integer(getLowerBound()); + case JavaRefPackage.JAVA_PARAMETER__UPPER_BOUND: + return new Integer(getUpperBound()); + case JavaRefPackage.JAVA_PARAMETER__MANY: + return isMany() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.JAVA_PARAMETER__REQUIRED: + return isRequired() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.JAVA_PARAMETER__ETYPE: if (resolve) return getEType(); return basicGetEType(); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaRefFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefFactoryImpl.java index aa26a7db4..18211be77 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaRefFactoryImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefFactoryImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaRefFactoryImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.List; @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory; @@ -311,7 +311,6 @@ public class JavaRefFactoryImpl extends EFactoryImpl implements JavaRefFactory { { return JavaRefPackage.eINSTANCE; } - public static JavaRefFactory getActiveFactory() { JavaRefPackage pkg = getPackage(); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaRefPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java index 6b8d7556a..9c82cafa7 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/JavaRefPackageImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: JavaRefPackageImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.List; @@ -26,24 +26,24 @@ import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; -import org.eclipse.jem.internal.java.ArrayType; -import org.eclipse.jem.internal.java.Block; -import org.eclipse.jem.internal.java.Comment; -import org.eclipse.jem.internal.java.Field; -import org.eclipse.jem.internal.java.Initializer; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaDataType; -import org.eclipse.jem.internal.java.JavaEvent; -import org.eclipse.jem.internal.java.JavaHelpers; -import org.eclipse.jem.internal.java.JavaPackage; -import org.eclipse.jem.internal.java.JavaParameter; -import org.eclipse.jem.internal.java.JavaParameterKind; -import org.eclipse.jem.internal.java.JavaRefFactory; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.JavaVisibilityKind; -import org.eclipse.jem.internal.java.Method; -import org.eclipse.jem.internal.java.Statement; -import org.eclipse.jem.internal.java.TypeKind; +import org.eclipse.jem.java.ArrayType; +import org.eclipse.jem.java.Block; +import org.eclipse.jem.java.Comment; +import org.eclipse.jem.java.Field; +import org.eclipse.jem.java.Initializer; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaDataType; +import org.eclipse.jem.java.JavaEvent; +import org.eclipse.jem.java.JavaHelpers; +import org.eclipse.jem.java.JavaPackage; +import org.eclipse.jem.java.JavaParameter; +import org.eclipse.jem.java.JavaParameterKind; +import org.eclipse.jem.java.JavaRefFactory; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.JavaVisibilityKind; +import org.eclipse.jem.java.Method; +import org.eclipse.jem.java.Statement; +import org.eclipse.jem.java.TypeKind; /** @@ -223,7 +223,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getJavaClass_Kind() { - return (EAttribute)javaClassEClass.getEAttributes().get(0); + return (EAttribute)javaClassEClass.getEStructuralFeatures().get(0); } /** @@ -233,7 +233,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getJavaClass_Public() { - return (EAttribute)javaClassEClass.getEAttributes().get(1); + return (EAttribute)javaClassEClass.getEStructuralFeatures().get(1); } /** @@ -243,7 +243,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getJavaClass_Final() { - return (EAttribute)javaClassEClass.getEAttributes().get(2); + return (EAttribute)javaClassEClass.getEStructuralFeatures().get(2); } /** @@ -251,7 +251,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_ImplementsInterfaces() { - return (EReference)javaClassEClass.getEReferences().get(0); + return (EReference)javaClassEClass.getEStructuralFeatures().get(3); } /** @@ -259,7 +259,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_ClassImport() { - return (EReference)javaClassEClass.getEReferences().get(1); + return (EReference)javaClassEClass.getEStructuralFeatures().get(4); } /** @@ -267,7 +267,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_PackageImports() { - return (EReference)javaClassEClass.getEReferences().get(2); + return (EReference)javaClassEClass.getEStructuralFeatures().get(5); } /** @@ -275,7 +275,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_Fields() { - return (EReference)javaClassEClass.getEReferences().get(3); + return (EReference)javaClassEClass.getEStructuralFeatures().get(6); } /** @@ -283,7 +283,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_Methods() { - return (EReference)javaClassEClass.getEReferences().get(4); + return (EReference)javaClassEClass.getEStructuralFeatures().get(7); } /** @@ -291,7 +291,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_Initializers() { - return (EReference)javaClassEClass.getEReferences().get(5); + return (EReference)javaClassEClass.getEStructuralFeatures().get(8); } /** @@ -299,7 +299,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_DeclaringClass() { - return (EReference)javaClassEClass.getEReferences().get(7); + return (EReference)javaClassEClass.getEStructuralFeatures().get(10); } /** @@ -307,7 +307,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_DeclaredClasses() { - return (EReference)javaClassEClass.getEReferences().get(6); + return (EReference)javaClassEClass.getEStructuralFeatures().get(9); } /** @@ -315,7 +315,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_JavaPackage() { - return (EReference)javaClassEClass.getEReferences().get(8); + return (EReference)javaClassEClass.getEStructuralFeatures().get(11); } /** @@ -323,7 +323,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_Events() { - return (EReference)javaClassEClass.getEReferences().get(9); + return (EReference)javaClassEClass.getEStructuralFeatures().get(12); } /** @@ -331,7 +331,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaClass_AllEvents() { - return (EReference)javaClassEClass.getEReferences().get(10); + return (EReference)javaClassEClass.getEStructuralFeatures().get(13); } /** @@ -349,7 +349,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getField_Final() { - return (EAttribute)fieldEClass.getEAttributes().get(0); + return (EAttribute)fieldEClass.getEStructuralFeatures().get(0); } /** @@ -359,7 +359,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getField_Static() { - return (EAttribute)fieldEClass.getEAttributes().get(1); + return (EAttribute)fieldEClass.getEStructuralFeatures().get(1); } /** @@ -367,7 +367,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getField_JavaVisibility() { - return (EAttribute)fieldEClass.getEAttributes().get(2); + return (EAttribute)fieldEClass.getEStructuralFeatures().get(2); } /** @@ -375,7 +375,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getField_JavaClass() { - return (EReference)fieldEClass.getEReferences().get(0); + return (EReference)fieldEClass.getEStructuralFeatures().get(3); } /** @@ -383,7 +383,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getField_Initializer() { - return (EReference)fieldEClass.getEReferences().get(1); + return (EReference)fieldEClass.getEStructuralFeatures().get(4); } /** @@ -401,7 +401,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getMethod_Abstract() { - return (EAttribute)methodEClass.getEAttributes().get(0); + return (EAttribute)methodEClass.getEStructuralFeatures().get(0); } /** @@ -411,7 +411,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getMethod_Native() { - return (EAttribute)methodEClass.getEAttributes().get(1); + return (EAttribute)methodEClass.getEStructuralFeatures().get(1); } /** @@ -421,7 +421,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getMethod_Synchronized() { - return (EAttribute)methodEClass.getEAttributes().get(2); + return (EAttribute)methodEClass.getEStructuralFeatures().get(2); } /** @@ -431,7 +431,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getMethod_Final() { - return (EAttribute)methodEClass.getEAttributes().get(3); + return (EAttribute)methodEClass.getEStructuralFeatures().get(3); } /** @@ -441,7 +441,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getMethod_Constructor() { - return (EAttribute)methodEClass.getEAttributes().get(4); + return (EAttribute)methodEClass.getEStructuralFeatures().get(4); } /** @@ -451,7 +451,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getMethod_Static() { - return (EAttribute)methodEClass.getEAttributes().get(5); + return (EAttribute)methodEClass.getEStructuralFeatures().get(5); } /** @@ -459,7 +459,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getMethod_JavaVisibility() { - return (EAttribute)methodEClass.getEAttributes().get(6); + return (EAttribute)methodEClass.getEStructuralFeatures().get(6); } /** @@ -467,7 +467,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getMethod_Parameters() { - return (EReference)methodEClass.getEReferences().get(0); + return (EReference)methodEClass.getEStructuralFeatures().get(7); } /** @@ -475,7 +475,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getMethod_JavaExceptions() { - return (EReference)methodEClass.getEReferences().get(1); + return (EReference)methodEClass.getEStructuralFeatures().get(8); } /** @@ -483,7 +483,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getMethod_JavaClass() { - return (EReference)methodEClass.getEReferences().get(2); + return (EReference)methodEClass.getEStructuralFeatures().get(9); } /** @@ -491,7 +491,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getMethod_Source() { - return (EReference)methodEClass.getEReferences().get(3); + return (EReference)methodEClass.getEStructuralFeatures().get(10); } /** @@ -509,7 +509,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getJavaParameter_Final() { - return (EAttribute)javaParameterEClass.getEAttributes().get(0); + return (EAttribute)javaParameterEClass.getEStructuralFeatures().get(0); } /** @@ -517,7 +517,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getJavaParameter_ParameterKind() { - return (EAttribute)javaParameterEClass.getEAttributes().get(1); + return (EAttribute)javaParameterEClass.getEStructuralFeatures().get(1); } /** @@ -533,7 +533,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getArrayType_ArrayDimensions() { - return (EAttribute)arrayTypeEClass.getEAttributes().get(0); + return (EAttribute)arrayTypeEClass.getEStructuralFeatures().get(0); } /** @@ -541,7 +541,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getArrayType_ComponentType() { - return (EReference)arrayTypeEClass.getEReferences().get(0); + return (EReference)arrayTypeEClass.getEStructuralFeatures().get(1); } /** @@ -573,7 +573,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getJavaPackage_JavaClasses() { - return (EReference)javaPackageEClass.getEReferences().get(0); + return (EReference)javaPackageEClass.getEStructuralFeatures().get(0); } /** @@ -589,7 +589,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getBlock_Source() { - return (EAttribute)blockEClass.getEAttributes().get(0); + return (EAttribute)blockEClass.getEStructuralFeatures().get(0); } /** @@ -597,7 +597,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getBlock_Name() { - return (EAttribute)blockEClass.getEAttributes().get(1); + return (EAttribute)blockEClass.getEStructuralFeatures().get(1); } /** @@ -605,7 +605,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getBlock_Contents() { - return (EReference)blockEClass.getEReferences().get(0); + return (EReference)blockEClass.getEStructuralFeatures().get(2); } /** @@ -637,7 +637,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EAttribute getInitializer_IsStatic() { - return (EAttribute)initializerEClass.getEAttributes().get(0); + return (EAttribute)initializerEClass.getEStructuralFeatures().get(0); } /** @@ -645,7 +645,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getInitializer_JavaClass() { - return (EReference)initializerEClass.getEReferences().get(0); + return (EReference)initializerEClass.getEStructuralFeatures().get(1); } /** @@ -653,7 +653,7 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { */ public EReference getInitializer_Source() { - return (EReference)initializerEClass.getEReferences().get(1); + return (EReference)initializerEClass.getEStructuralFeatures().get(2); } /** @@ -841,20 +841,20 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { // Initialize classes and features; add operations and parameters initEClass(javaClassEClass, JavaClass.class, "JavaClass", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getJavaClass_Kind(), this.getTypeKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getJavaClass_Public(), ecorePackage.getEBoolean(), "public", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getJavaClass_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEReference(getJavaClass_ImplementsInterfaces(), this.getJavaClass(), null, "implementsInterfaces", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_ClassImport(), this.getJavaClass(), null, "classImport", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_PackageImports(), this.getJavaPackage(), null, "packageImports", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_Fields(), this.getField(), this.getField_JavaClass(), "fields", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_Methods(), this.getMethod(), this.getMethod_JavaClass(), "methods", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_Initializers(), this.getInitializer(), this.getInitializer_JavaClass(), "initializers", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_DeclaredClasses(), this.getJavaClass(), this.getJavaClass_DeclaringClass(), "declaredClasses", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_DeclaringClass(), this.getJavaClass(), this.getJavaClass_DeclaredClasses(), "declaringClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_JavaPackage(), this.getJavaPackage(), this.getJavaPackage_JavaClasses(), "javaPackage", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_Events(), this.getJavaEvent(), null, "events", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getJavaClass_AllEvents(), this.getJavaEvent(), null, "allEvents", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEAttribute(getJavaClass_Kind(), this.getTypeKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getJavaClass_Public(), ecorePackage.getEBoolean(), "public", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getJavaClass_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_ImplementsInterfaces(), this.getJavaClass(), null, "implementsInterfaces", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_ClassImport(), this.getJavaClass(), null, "classImport", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_PackageImports(), this.getJavaPackage(), null, "packageImports", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_Fields(), this.getField(), this.getField_JavaClass(), "fields", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_Methods(), this.getMethod(), this.getMethod_JavaClass(), "methods", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_Initializers(), this.getInitializer(), this.getInitializer_JavaClass(), "initializers", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_DeclaredClasses(), this.getJavaClass(), this.getJavaClass_DeclaringClass(), "declaredClasses", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_DeclaringClass(), this.getJavaClass(), this.getJavaClass_DeclaredClasses(), "declaringClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_JavaPackage(), this.getJavaPackage(), this.getJavaPackage_JavaClasses(), "javaPackage", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_Events(), this.getJavaEvent(), null, "events", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getJavaClass_AllEvents(), this.getJavaEvent(), null, "allEvents", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "isNested"); @@ -914,13 +914,13 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { addEParameter(op, this.getJavaClass(), "javaclass"); initEClass(initializerEClass, Initializer.class, "Initializer", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getInitializer_IsStatic(), ecorePackage.getEBooleanObject(), "isStatic", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEReference(getInitializer_JavaClass(), this.getJavaClass(), this.getJavaClass_Initializers(), "javaClass", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getInitializer_Source(), this.getBlock(), null, "source", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEAttribute(getInitializer_IsStatic(), ecorePackage.getEBooleanObject(), "isStatic", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEReference(getInitializer_JavaClass(), this.getJavaClass(), this.getJavaClass_Initializers(), "javaClass", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getInitializer_Source(), this.getBlock(), null, "source", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); initEClass(javaParameterEClass, JavaParameter.class, "JavaParameter", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getJavaParameter_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getJavaParameter_ParameterKind(), this.getJavaParameterKind(), "parameterKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); + initEAttribute(getJavaParameter_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getJavaParameter_ParameterKind(), this.getJavaParameterKind(), "parameterKind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); addEOperation(javaParameterEClass, ecorePackage.getEBoolean(), "isArray"); @@ -931,17 +931,17 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { addEOperation(javaParameterEClass, ecorePackage.getEString(), "getQualifiedName"); initEClass(methodEClass, Method.class, "Method", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getMethod_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getMethod_Native(), ecorePackage.getEBoolean(), "native", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getMethod_Synchronized(), ecorePackage.getEBoolean(), "synchronized", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getMethod_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getMethod_Constructor(), ecorePackage.getEBoolean(), "constructor", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getMethod_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getMethod_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEReference(getMethod_Parameters(), this.getJavaParameter(), null, "parameters", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getMethod_JavaExceptions(), this.getJavaClass(), null, "javaExceptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getMethod_JavaClass(), this.getJavaClass(), this.getJavaClass_Methods(), "javaClass", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getMethod_Source(), this.getBlock(), null, "source", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEAttribute(getMethod_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getMethod_Native(), ecorePackage.getEBoolean(), "native", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getMethod_Synchronized(), ecorePackage.getEBoolean(), "synchronized", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getMethod_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getMethod_Constructor(), ecorePackage.getEBoolean(), "constructor", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getMethod_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getMethod_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEReference(getMethod_Parameters(), this.getJavaParameter(), null, "parameters", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getMethod_JavaExceptions(), this.getJavaClass(), null, "javaExceptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getMethod_JavaClass(), this.getJavaClass(), this.getJavaClass_Methods(), "javaClass", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getMethod_Source(), this.getBlock(), null, "source", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); addEOperation(methodEClass, this.getJavaClass(), "getContainingJavaClass"); @@ -965,35 +965,35 @@ public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage { addEOperation(methodEClass, ecorePackage.getEBoolean(), "isVoid"); initEClass(fieldEClass, Field.class, "Field", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getField_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getField_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getField_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEReference(getField_JavaClass(), this.getJavaClass(), this.getJavaClass_Fields(), "javaClass", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); - initEReference(getField_Initializer(), this.getBlock(), null, "initializer", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEAttribute(getField_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getField_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getField_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEReference(getField_JavaClass(), this.getJavaClass(), this.getJavaClass_Fields(), "javaClass", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); + initEReference(getField_Initializer(), this.getBlock(), null, "initializer", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); addEOperation(fieldEClass, this.getJavaClass(), "getContainingJavaClass"); addEOperation(fieldEClass, ecorePackage.getEBoolean(), "isArray"); initEClass(blockEClass, Block.class, "Block", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getBlock_Source(), ecorePackage.getEString(), "source", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEAttribute(getBlock_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEReference(getBlock_Contents(), this.getBlock(), null, "contents", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEAttribute(getBlock_Source(), ecorePackage.getEString(), "source", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEAttribute(getBlock_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEReference(getBlock_Contents(), this.getBlock(), null, "contents", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE); initEClass(statementEClass, Statement.class, "Statement", !IS_ABSTRACT, !IS_INTERFACE); initEClass(javaPackageEClass, JavaPackage.class, "JavaPackage", !IS_ABSTRACT, !IS_INTERFACE); - initEReference(getJavaPackage_JavaClasses(), this.getJavaClass(), this.getJavaClass_JavaPackage(), "javaClasses", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEReference(getJavaPackage_JavaClasses(), this.getJavaClass(), this.getJavaClass_JavaPackage(), "javaClasses", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); initEClass(javaDataTypeEClass, JavaDataType.class, "JavaDataType", !IS_ABSTRACT, !IS_INTERFACE); addEOperation(javaDataTypeEClass, ecorePackage.getEString(), "getDefaultValueString"); initEClass(arrayTypeEClass, ArrayType.class, "ArrayType", !IS_ABSTRACT, !IS_INTERFACE); - initEAttribute(getArrayType_ArrayDimensions(), ecorePackage.getEInt(), "arrayDimensions", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE); - initEReference(getArrayType_ComponentType(), theEcorePackage.getEClassifier(), null, "componentType", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE); + initEAttribute(getArrayType_ArrayDimensions(), ecorePackage.getEInt(), "arrayDimensions", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); + initEReference(getArrayType_ComponentType(), theEcorePackage.getEClassifier(), null, "componentType", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); addEOperation(arrayTypeEClass, this.getJTypeJavaHelpers(), "getFinalComponentType"); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/MethodImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/MethodImpl.java index d5ae828e3..0d0436056 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/MethodImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/MethodImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: MethodImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -33,13 +33,13 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.Block; -import org.eclipse.jem.internal.java.JavaClass; -import org.eclipse.jem.internal.java.JavaHelpers; -import org.eclipse.jem.internal.java.JavaParameter; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.JavaVisibilityKind; -import org.eclipse.jem.internal.java.Method; +import org.eclipse.jem.java.Block; +import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.java.JavaHelpers; +import org.eclipse.jem.java.JavaParameter; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.JavaVisibilityKind; +import org.eclipse.jem.java.Method; import org.eclipse.jem.internal.java.adapters.ReadAdaptor; /** @@ -570,7 +570,7 @@ public class MethodImpl extends EOperationImpl implements Method{ * This is usually determined by the "generated" tag in the comment. */ public boolean isGenerated() { - return false; + return isGenerated; } /** @@ -663,7 +663,7 @@ public class MethodImpl extends EOperationImpl implements Method{ { if (source != null && source.eIsProxy()) { Block oldSource = source; - source = (Block)EcoreUtil.resolve(source, this); + source = (Block)eResolveProxy((InternalEObject)source); if (source != oldSource) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.METHOD__SOURCE, oldSource, source)); @@ -705,6 +705,18 @@ public class MethodImpl extends EOperationImpl implements Method{ return eAnnotations != null && !eAnnotations.isEmpty(); case JavaRefPackage.METHOD__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case JavaRefPackage.METHOD__ORDERED: + return ordered != ORDERED_EDEFAULT; + case JavaRefPackage.METHOD__UNIQUE: + return unique != UNIQUE_EDEFAULT; + case JavaRefPackage.METHOD__LOWER_BOUND: + return lowerBound != LOWER_BOUND_EDEFAULT; + case JavaRefPackage.METHOD__UPPER_BOUND: + return upperBound != UPPER_BOUND_EDEFAULT; + case JavaRefPackage.METHOD__MANY: + return isMany() != false; + case JavaRefPackage.METHOD__REQUIRED: + return isRequired() != false; case JavaRefPackage.METHOD__ETYPE: return eType != null; case JavaRefPackage.METHOD__ECONTAINING_CLASS: @@ -752,6 +764,18 @@ public class MethodImpl extends EOperationImpl implements Method{ case JavaRefPackage.METHOD__NAME: setName((String)newValue); return; + case JavaRefPackage.METHOD__ORDERED: + setOrdered(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.METHOD__UNIQUE: + setUnique(((Boolean)newValue).booleanValue()); + return; + case JavaRefPackage.METHOD__LOWER_BOUND: + setLowerBound(((Integer)newValue).intValue()); + return; + case JavaRefPackage.METHOD__UPPER_BOUND: + setUpperBound(((Integer)newValue).intValue()); + return; case JavaRefPackage.METHOD__ETYPE: setEType((EClassifier)newValue); return; @@ -814,6 +838,18 @@ public class MethodImpl extends EOperationImpl implements Method{ case JavaRefPackage.METHOD__NAME: setName(NAME_EDEFAULT); return; + case JavaRefPackage.METHOD__ORDERED: + setOrdered(ORDERED_EDEFAULT); + return; + case JavaRefPackage.METHOD__UNIQUE: + setUnique(UNIQUE_EDEFAULT); + return; + case JavaRefPackage.METHOD__LOWER_BOUND: + setLowerBound(LOWER_BOUND_EDEFAULT); + return; + case JavaRefPackage.METHOD__UPPER_BOUND: + setUpperBound(UPPER_BOUND_EDEFAULT); + return; case JavaRefPackage.METHOD__ETYPE: setEType((EClassifier)null); return; @@ -996,6 +1032,18 @@ public class MethodImpl extends EOperationImpl implements Method{ return getEAnnotations(); case JavaRefPackage.METHOD__NAME: return getName(); + case JavaRefPackage.METHOD__ORDERED: + return isOrdered() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.METHOD__UNIQUE: + return isUnique() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.METHOD__LOWER_BOUND: + return new Integer(getLowerBound()); + case JavaRefPackage.METHOD__UPPER_BOUND: + return new Integer(getUpperBound()); + case JavaRefPackage.METHOD__MANY: + return isMany() ? Boolean.TRUE : Boolean.FALSE; + case JavaRefPackage.METHOD__REQUIRED: + return isRequired() ? Boolean.TRUE : Boolean.FALSE; case JavaRefPackage.METHOD__ETYPE: if (resolve) return getEType(); return basicGetEType(); diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/StatementImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/StatementImpl.java index eac100621..327e17fa3 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/StatementImpl.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/StatementImpl.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: StatementImpl.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.Collection; @@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jem.internal.java.JavaRefPackage; -import org.eclipse.jem.internal.java.Statement; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.Statement; /** * @generated */ diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/URL.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/URL.java index b5ec06cf2..be53a289f 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/impl/URL.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/URL.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.impl; +package org.eclipse.jem.java.impl; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.impl; *******************************************************************************/ /* * $RCSfile: URL.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/util/JavaRefAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java index bafc2c071..6617192a4 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/util/JavaRefAdapterFactory.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.util; +package org.eclipse.jem.java.util; /******************************************************************************* * Copyright (c) 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.java.util; *******************************************************************************/ /* * $RCSfile: JavaRefAdapterFactory.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EParameter; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; /** @@ -38,7 +38,7 @@ import org.eclipse.jem.internal.java.*; * The <b>Adapter Factory</b> for the model. * It provides an adapter <code>createXXX</code> method for each class of the model. * <!-- end-user-doc --> - * @see org.eclipse.jem.internal.java.JavaRefPackage + * @see org.eclipse.jem.java.JavaRefPackage * @generated */ public class JavaRefAdapterFactory extends AdapterFactoryImpl @@ -177,13 +177,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.JavaClass <em>Java Class</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaClass <em>Java Class</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.JavaClass + * @see org.eclipse.jem.java.JavaClass * @generated */ public Adapter createJavaClassAdapter() @@ -192,13 +192,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.Initializer <em>Initializer</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Initializer <em>Initializer</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.Initializer + * @see org.eclipse.jem.java.Initializer * @generated */ public Adapter createInitializerAdapter() @@ -207,13 +207,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.JavaParameter <em>Java Parameter</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaParameter <em>Java Parameter</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.JavaParameter + * @see org.eclipse.jem.java.JavaParameter * @generated */ public Adapter createJavaParameterAdapter() @@ -222,13 +222,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.Method <em>Method</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Method <em>Method</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.Method + * @see org.eclipse.jem.java.Method * @generated */ public Adapter createMethodAdapter() @@ -237,13 +237,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.Field <em>Field</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Field <em>Field</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.Field + * @see org.eclipse.jem.java.Field * @generated */ public Adapter createFieldAdapter() @@ -252,13 +252,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.Block <em>Block</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Block <em>Block</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.Block + * @see org.eclipse.jem.java.Block * @generated */ public Adapter createBlockAdapter() @@ -267,13 +267,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.Comment <em>Comment</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Comment <em>Comment</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.Comment + * @see org.eclipse.jem.java.Comment * @generated */ public Adapter createCommentAdapter() @@ -282,13 +282,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.Statement <em>Statement</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Statement <em>Statement</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.Statement + * @see org.eclipse.jem.java.Statement * @generated */ public Adapter createStatementAdapter() @@ -297,13 +297,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.JavaPackage <em>Java Package</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaPackage <em>Java Package</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.JavaPackage + * @see org.eclipse.jem.java.JavaPackage * @generated */ public Adapter createJavaPackageAdapter() @@ -312,13 +312,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.JavaDataType <em>Java Data Type</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaDataType <em>Java Data Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.JavaDataType + * @see org.eclipse.jem.java.JavaDataType * @generated */ public Adapter createJavaDataTypeAdapter() @@ -327,13 +327,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.ArrayType <em>Array Type</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.ArrayType <em>Array Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.ArrayType + * @see org.eclipse.jem.java.ArrayType * @generated */ public Adapter createArrayTypeAdapter() @@ -342,13 +342,13 @@ public class JavaRefAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jem.internal.java.JavaEvent <em>Java Event</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaEvent <em>Java Event</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.jem.internal.java.JavaEvent + * @see org.eclipse.jem.java.JavaEvent * @generated */ public Adapter createJavaEventAdapter() diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/util/JavaRefSwitch.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java index 387f84fd4..73bb047ca 100644 --- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/util/JavaRefSwitch.java +++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java @@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.java.util; +package org.eclipse.jem.java.util; /******************************************************************************* * Copyright (c) 2003 IBM Corporation and others. @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.java.util; *******************************************************************************/ /* * $RCSfile: JavaRefSwitch.java,v $ - * $Revision: 1.1 $ $Date: 2003/10/27 17:12:30 $ + * $Revision: 1.1 $ $Date: 2004/01/13 16:16:21 $ */ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EParameter; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.jem.internal.java.*; +import org.eclipse.jem.java.*; @@ -40,7 +40,7 @@ import org.eclipse.jem.internal.java.*; * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.eclipse.jem.internal.java.JavaRefPackage + * @see org.eclipse.jem.java.JavaRefPackage * @generated */ public class JavaRefSwitch { diff --git a/plugins/org.eclipse.jem/overrides/..ROOT...override b/plugins/org.eclipse.jem/overrides/..ROOT...override index c2eb93184..8c1ea3a24 100644 --- a/plugins/org.eclipse.jem/overrides/..ROOT...override +++ b/plugins/org.eclipse.jem/overrides/..ROOT...override @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <event:AddMany xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:event="event.xmi" - featureName="eReferences"> + featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> <!-- too remind us that these are need to be done yet in the new allocation scheme. <addedEObjects xsi:type="ecore:EAttribute" name="instantiateUsing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> diff --git a/plugins/org.eclipse.jem/overrides/java/lang/Object.override b/plugins/org.eclipse.jem/overrides/java/lang/Object.override index 002dd973e..fdbffdcb7 100644 --- a/plugins/org.eclipse.jem/overrides/java/lang/Object.override +++ b/plugins/org.eclipse.jem/overrides/java/lang/Object.override @@ -8,28 +8,28 @@ will be done at the same time. And since Object needs to be introspected before anything else can be done, these will be done before anything needs them. --> - <event:Add notifierURI="java:/#boolean" featureName="eReferences"> + <event:Add notifierURI="java:/#boolean" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> - <event:Add notifierURI="java:/#char" featureName="eReferences"> + <event:Add notifierURI="java:/#char" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> - <event:Add notifierURI="java:/#int" featureName="eReferences"> + <event:Add notifierURI="java:/#int" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> - <event:Add notifierURI="java:/#float" featureName="eReferences"> + <event:Add notifierURI="java:/#float" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> - <event:Add notifierURI="java:/#short" featureName="eReferences"> + <event:Add notifierURI="java:/#short" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> - <event:Add notifierURI="java:/#long" featureName="eReferences"> + <event:Add notifierURI="java:/#long" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> - <event:Add notifierURI="java:/#double" featureName="eReferences"> + <event:Add notifierURI="java:/#double" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> - <event:Add notifierURI="java:/#byte" featureName="eReferences"> + <event:Add notifierURI="java:/#byte" featureName="eStructuralFeatures"> <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/> </event:Add> </xmi:XMI> diff --git a/plugins/org.eclipse.jem/plugin.xml b/plugins/org.eclipse.jem/plugin.xml index 719c67e56..c8829f1d6 100644 --- a/plugins/org.eclipse.jem/plugin.xml +++ b/plugins/org.eclipse.jem/plugin.xml @@ -2,7 +2,7 @@ <plugin id="org.eclipse.jem" name="%pluginName" - version="0.5.0" + version="1.0.0" provider-name="%providerName" class="org.eclipse.jem.internal.core.JEMPlugin"> @@ -13,11 +13,11 @@ </library> <library name="mofjava.jar"> <export name="*"/> - <packages prefixes="org.eclipse.jem.internal.core,org.eclipse.jem.internal.java"/> + <packages prefixes="org.eclipse.jem.internal.core,org.eclipse.jem.internal.java,org.eclipse.jem.java"/> </library> </runtime> <requires> - <import plugin="org.eclipse.emf.ecore.xmi" export="true"/> + <import plugin="org.eclipse.emf.ecore.xmi"/> </requires> @@ -29,7 +29,7 @@ </package> <package uri="java.xmi" - class="org.eclipse.jem.internal.java.JavaRefPackage"> + class="org.eclipse.jem.java.JavaRefPackage"> </package> </extension> <extension |